vserver 1.9.3

[linux-2.6.git] / drivers / pcmcia / ds.c

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 71592c7..b4f741a 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -50,6 +50,7 @@
 #include <linux/poll.h>
 #include <linux/pci.h>
 #include <linux/list.h>
+#include <linux/delay.h>
 #include <linux/workqueue.h>
 
 #include <asm/atomic.h>
@@ -133,7 +134,7 @@ static dev_info_t dev_info = "Driver Services";
 
 static int major_dev = -1;
 
-extern struct proc_dir_entry *proc_pccard;
+static struct proc_dir_entry *proc_pccard;
 
 /*====================================================================*/
 
@@ -1080,8 +1081,7 @@ static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev)
         * Ugly. But we want to wait for the socket threads to have started up.
         * We really should let the drivers themselves drive some of this..
         */
-       current->state = TASK_INTERRUPTIBLE;
-       schedule_timeout(HZ/4);
+       msleep(250);
 
        init_waitqueue_head(&s->queue);
        init_waitqueue_head(&s->request);