patch-2_6_7-vs1_9_1_12

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

diff --git a/drivers/input/gameport/vortex.c b/drivers/input/gameport/vortex.c
index 55d475d..02c31b7 100644 (file)
--- a/drivers/input/gameport/vortex.c
+++ b/drivers/input/gameport/vortex.c
@@ -40,6 +40,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 #include <linux/gameport.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
@@ -82,7 +83,7 @@ static int vortex_cooked_read(struct gameport *gameport, int *axes, int *buttons
                axes[i] = readw(vortex->io + VORTEX_AXD + i * sizeof(u32));
                if (axes[i] == 0x1fff) axes[i] = -1;
        }
-        
+
         return 0;
 }
 
@@ -93,7 +94,7 @@ static int vortex_open(struct gameport *gameport, int mode)
        switch (mode) {
                case GAMEPORT_MODE_COOKED:
                        writeb(0x40, vortex->io + VORTEX_GCR);
-                       wait_ms(VORTEX_DATA_WAIT);
+                       msleep(VORTEX_DATA_WAIT);
                        return 0;
                case GAMEPORT_MODE_RAW:
                        writeb(0x00, vortex->io + VORTEX_GCR);
@@ -121,7 +122,7 @@ static int __devinit vortex_probe(struct pci_dev *dev, const struct pci_device_i
 
        vortex->gameport.driver = vortex;
        vortex->gameport.fuzz = 64;
-       
+
        vortex->gameport.read = vortex_read;
        vortex->gameport.trigger = vortex_trigger;
        vortex->gameport.cooked_read = vortex_cooked_read;
@@ -144,7 +145,7 @@ static int __devinit vortex_probe(struct pci_dev *dev, const struct pci_device_i
        vortex->io = vortex->base + id->driver_data;
 
        gameport_register_port(&vortex->gameport);
-       
+
        printk(KERN_INFO "gameport at pci%s speed %d kHz\n",
                pci_name(dev), vortex->gameport.speed);