Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[~andy/linux] / drivers / input / serio / maceps2.c

diff --git a/drivers/input/serio/maceps2.c b/drivers/input/serio/maceps2.c
index f08a5d0cd5fae5c148a8bd697e6c93af213db3ba..61da763b120983bf0ab9c112f3a9f797ef5f56e5 100644 (file)
--- a/drivers/input/serio/maceps2.c
+++ b/drivers/input/serio/maceps2.c
@@ -21,7 +21,6 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/system.h>
 #include <asm/ip32/mace.h>
 #include <asm/ip32/ip32_ints.h>
 
@@ -72,8 +71,7 @@ static int maceps2_write(struct serio *dev, unsigned char val)
        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;
@@ -81,7 +79,7 @@ static irqreturn_t maceps2_interrupt(int irq, void *dev_id,
 
        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;