git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
input
/
serio
/
pcips2.c
diff --git
a/drivers/input/serio/pcips2.c
b/drivers/input/serio/pcips2.c
index
1e139c5
..
ea5e3c6
100644
(file)
--- a/
drivers/input/serio/pcips2.c
+++ b/
drivers/input/serio/pcips2.c
@@
-58,7
+58,7
@@
static int pcips2_write(struct serio *io, unsigned char val)
return 0;
}
return 0;
}
-static irqreturn_t pcips2_interrupt(int irq, void *devid
, struct pt_regs *regs
)
+static irqreturn_t pcips2_interrupt(int irq, void *devid)
{
struct pcips2_data *ps2if = devid;
unsigned char status, scancode;
{
struct pcips2_data *ps2if = devid;
unsigned char status, scancode;
@@
-80,7
+80,7
@@
static irqreturn_t pcips2_interrupt(int irq, void *devid, struct pt_regs *regs)
if (hweight8(scancode) & 1)
flag ^= SERIO_PARITY;
if (hweight8(scancode) & 1)
flag ^= SERIO_PARITY;
- serio_interrupt(ps2if->io, scancode, flag
, regs
);
+ serio_interrupt(ps2if->io, scancode, flag);
} while (1);
return IRQ_RETVAL(handled);
}
} while (1);
return IRQ_RETVAL(handled);
}
@@
-107,7
+107,7
@@
static int pcips2_open(struct serio *io)
outb(PS2_CTRL_ENABLE, ps2if->base);
pcips2_flush_input(ps2if);
outb(PS2_CTRL_ENABLE, ps2if->base);
pcips2_flush_input(ps2if);
- ret = request_irq(ps2if->dev->irq, pcips2_interrupt,
SA_SHIRQ
,
+ ret = request_irq(ps2if->dev->irq, pcips2_interrupt,
IRQF_SHARED
,
"pcips2", ps2if);
if (ret == 0)
val = PS2_CTRL_ENABLE | PS2_CTRL_RXIRQ;
"pcips2", ps2if);
if (ret == 0)
val = PS2_CTRL_ENABLE | PS2_CTRL_RXIRQ;