vserver 1.9.3

[linux-2.6.git] / drivers / input / gameport / vortex.c

diff --git a/drivers/input/gameport/vortex.c b/drivers/input/gameport/vortex.c
index 02c31b7..e0a1c3e 100644 (file)
--- a/drivers/input/gameport/vortex.c
+++ b/drivers/input/gameport/vortex.c
@@ -55,8 +55,8 @@ MODULE_LICENSE("GPL");
 struct vortex {
        struct gameport gameport;
        struct pci_dev *dev;
-        unsigned char *base;
-        unsigned char *io;
+        unsigned char __iomem *base;
+        unsigned char __iomem *io;
        char phys[32];
 };
 
@@ -166,7 +166,7 @@ static struct pci_device_id vortex_id_table[] =
  { 0 }};
 
 static struct pci_driver vortex_driver = {
-       .name =         "vortex",
+       .name =         "vortex_gameport",
        .id_table =     vortex_id_table,
        .probe =        vortex_probe,
        .remove =       __devexit_p(vortex_remove),