patch-2_6_7-vs1_9_1_12

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

diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index 4b52ffe..f31ce0b 100644 (file)
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
@@ -12,18 +12,18 @@
 /*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or 
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * 
+ *
  * Should you need to contact me, the author, you can do so either by
  * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
  * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
@@ -35,6 +35,7 @@
 #include <linux/ioport.h>
 #include <linux/config.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 #include <linux/gameport.h>
 #include <linux/slab.h>
 #include <linux/pnp.h>
@@ -58,7 +59,7 @@ struct ns558 {
        char phys[32];
        char name[32];
 };
-       
+
 static LIST_HEAD(ns558_list);
 
 /*
@@ -103,7 +104,7 @@ static void ns558_isa_probe(int io)
                i = 0;
                goto out;
        }
-       wait_ms(3);
+       msleep(3);
 /*
  * After some time (4ms) the axes shouldn't change anymore.
  */
@@ -115,7 +116,7 @@ static void ns558_isa_probe(int io)
                        i = 0;
                        goto out;
                }
-/* 
+/*
  * And now find the number of mirrors of the port.
  */
 
@@ -129,7 +130,7 @@ static void ns558_isa_probe(int io)
                outb(0xff, io & (-1 << i));
                for (j = b = 0; j < 1000; j++)
                        if (inb(io & (-1 << i)) != inb((io & (-1 << i)) + (1 << i) - 1)) b++;
-               wait_ms(3);
+               msleep(3);
 
                if (b > 300) {                                  /* We allow 30% difference */
                        release_region(io & (-1 << i), (1 << i));
@@ -291,7 +292,7 @@ void __exit ns558_exit(void)
                                release_region(port->gameport.io & ~(port->size - 1), port->size);
                                kfree(port);
                                break;
-               
+
                        default:
                                break;
                }