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
/
sa1111ps2.c
diff --git
a/drivers/input/serio/sa1111ps2.c
b/drivers/input/serio/sa1111ps2.c
index
ebd9976
..
5595087
100644
(file)
--- a/
drivers/input/serio/sa1111ps2.c
+++ b/
drivers/input/serio/sa1111ps2.c
@@
-40,7
+40,7
@@
struct ps2if {
* at the most one, but we loop for safety. If there was a
* framing error, we have to manually clear the status.
*/
* at the most one, but we loop for safety. If there was a
* framing error, we have to manually clear the status.
*/
-static irqreturn_t ps2_rxint(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t ps2_rxint(int irq, void *dev_id)
{
struct ps2if *ps2if = dev_id;
unsigned int scancode, flag, status;
{
struct ps2if *ps2if = dev_id;
unsigned int scancode, flag, status;
@@
-58,7
+58,7
@@
static irqreturn_t ps2_rxint(int irq, void *dev_id, 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);
status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
}
status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
}
@@
-69,7
+69,7
@@
static irqreturn_t ps2_rxint(int irq, void *dev_id, struct pt_regs *regs)
/*
* Completion of ps2 write
*/
/*
* Completion of ps2 write
*/
-static irqreturn_t ps2_txint(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t ps2_txint(int irq, void *dev_id)
{
struct ps2if *ps2if = dev_id;
unsigned int status;
{
struct ps2if *ps2if = dev_id;
unsigned int status;