upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[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..3f0df33 100644 (file)
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -28,7 +28,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;
@@ -245,7 +245,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 +272,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);