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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
input
/
serio
/
maceps2.c
diff --git
a/drivers/input/serio/maceps2.c
b/drivers/input/serio/maceps2.c
index
f08a5d0
..
558200e
100644
(file)
--- a/
drivers/input/serio/maceps2.c
+++ b/
drivers/input/serio/maceps2.c
@@
-72,8
+72,7
@@
static int maceps2_write(struct serio *dev, unsigned char val)
return -1;
}
return -1;
}
-static irqreturn_t maceps2_interrupt(int irq, void *dev_id,
- struct pt_regs *regs)
+static irqreturn_t maceps2_interrupt(int irq, void *dev_id)
{
struct serio *dev = dev_id;
struct mace_ps2port *port = ((struct maceps2_data *)dev->port_data)->port;
{
struct serio *dev = dev_id;
struct mace_ps2port *port = ((struct maceps2_data *)dev->port_data)->port;
@@
-81,7
+80,7
@@
static irqreturn_t maceps2_interrupt(int irq, void *dev_id,
if (port->status & PS2_STATUS_RX_FULL) {
byte = port->rx;
if (port->status & PS2_STATUS_RX_FULL) {
byte = port->rx;
- serio_interrupt(dev, byte & 0xff, 0
, regs
);
+ serio_interrupt(dev, byte & 0xff, 0);
}
return IRQ_HANDLED;
}
return IRQ_HANDLED;