git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
pcmcia
/
sa1100_h3600.c
diff --git
a/drivers/pcmcia/sa1100_h3600.c
b/drivers/pcmcia/sa1100_h3600.c
index
e442953
..
64fd5e3
100644
(file)
--- a/
drivers/pcmcia/sa1100_h3600.c
+++ b/
drivers/pcmcia/sa1100_h3600.c
@@
-10,6
+10,7
@@
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/init.h>
+#include <linux/delay.h>
#include <asm/hardware.h>
#include <asm/irq.h>
#include <asm/hardware.h>
#include <asm/irq.h>
@@
-96,8
+97,7
@@
static void h3600_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
set_h3600_egpio(IPAQ_EGPIO_OPT_ON);
clr_h3600_egpio(IPAQ_EGPIO_OPT_RESET);
set_h3600_egpio(IPAQ_EGPIO_OPT_ON);
clr_h3600_egpio(IPAQ_EGPIO_OPT_RESET);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(10*HZ / 1000);
+ msleep(10);
soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
}
soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
}