X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fserial%2Ficom.c;h=645924cf6eae1c4d77036d4ce289c098ab7b1062;hb=9e1bf581d67d87a1d7fc0ea500729e3a03643a26;hp=63b647fcc75ed6540db294fc0d11789955f22ae1;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 63b647fcc..645924cf6 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -46,7 +46,6 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/smp.h>
@@ -54,13 +53,13 @@
 #include <linux/spinlock.h>
 #include <linux/kobject.h>
 #include <linux/firmware.h>
-#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
+#include <asm/bitops.h>
 
 #include "icom.h"
 
@@ -140,6 +139,12 @@ static inline void trace(struct icom_port *, char *, unsigned long) {};
 static inline void trace(struct icom_port *icom_port, char *trace_pt, unsigned long trace_data) {};
 #endif
 
+static void msleep(unsigned long msecs)
+{
+	set_current_state(TASK_UNINTERRUPTIBLE);
+	schedule_timeout(MSECS_TO_JIFFIES(msecs));
+}
+
 static void free_port_memory(struct icom_port *icom_port)
 {
 	struct pci_dev *dev = icom_port->adapter->pci_dev;
@@ -1693,4 +1698,3 @@ MODULE_DESCRIPTION("IBM iSeries Serial IOA driver");
 MODULE_SUPPORTED_DEVICE
     ("IBM iSeries 2745, 2771, 2772, 2742, 2793 and 2805 Communications adapters");
 MODULE_LICENSE("GPL");
-