fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / input / serio / sa1111ps2.c

diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 62937f5..5595087 100644 (file)
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -20,7 +20,6 @@
 #include <linux/spinlock.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/system.h>
 
 #include <asm/hardware/sa1111.h>
@@ -28,7 +27,7 @@
 struct ps2if {
        struct serio            *io;
        struct sa1111_dev       *dev;
-       unsigned long           base;
+       void __iomem            *base;
        unsigned int            open;
        spinlock_t              lock;
        unsigned int            head;
@@ -41,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.
  */
-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;
@@ -59,7 +58,7 @@ static irqreturn_t ps2_rxint(int irq, void *dev_id, struct pt_regs *regs)
                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);
         }
@@ -70,7 +69,7 @@ static irqreturn_t ps2_rxint(int irq, void *dev_id, struct pt_regs *regs)
 /*
  * 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;
@@ -245,7 +244,7 @@ static int ps2_probe(struct sa1111_dev *dev)
        memset(ps2if, 0, sizeof(struct ps2if));
        memset(serio, 0, sizeof(struct serio));
 
-       serio->type             = SERIO_8042;
+       serio->id.type          = SERIO_8042;
        serio->write            = ps2_write;
        serio->open             = ps2_open;
        serio->close            = ps2_close;
@@ -272,7 +271,7 @@ static int ps2_probe(struct sa1111_dev *dev)
        /*
         * Our parent device has already mapped the region.
         */
-       ps2if->base = (unsigned long)dev->mapbase;
+       ps2if->base = dev->mapbase;
 
        sa1111_enable_device(ps2if->dev);