This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / 8390.c

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index e3053a8..04dcacd 100644 (file)
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -58,9 +58,9 @@ static const char version[] =
 #include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/string.h>
-#include <linux/bitops.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
+#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <linux/delay.h>
@@ -813,7 +813,7 @@ static void ei_rx_overrun(struct net_device *dev)
         * We wait at least 10ms.
         */
 
-       mdelay(10);
+       udelay(10*1000);
 
        /*
         * Reset RBCR[01] back to zero as per magic incantation.