patch-2.4.0-test10 linux/drivers/net/pcmcia/3c574_cs.c

• Lines: 37
• Date: Thu Oct 26 16:52:16 2000
• Orig file: v2.4.0-test9/linux/drivers/net/pcmcia/3c574_cs.c
• Orig date: Sat Sep 2 00:15:37 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/pcmcia/3c574_cs.c linux/drivers/net/pcmcia/3c574_cs.c
@@ -117,7 +117,7 @@
 static int max_interrupt_work = 32;
 
 /* Force full duplex modes? */
-static int full_duplex = 0;
+static int full_duplex;
 
 /* To minimize the size of the driver source and make the driver more
    readable not all constants are symbolically defined.
@@ -511,11 +511,11 @@
 		
 		/* Roadrunner only: Turn on the MII transceiver */
 		outw(0x8040, ioaddr + Wn3_Options);
-		udelay(1000);
+		mdelay(1);
 		outw(0xc040, ioaddr + Wn3_Options);
 		wait_for_completion(dev, TxReset);
 		wait_for_completion(dev, RxReset);
-		udelay(1000);
+		mdelay(1);
 		outw(0x8040, ioaddr + Wn3_Options);
 		
 		EL3WINDOW(4);
@@ -783,11 +783,11 @@
 	
 	/* Roadrunner only: Turn on the MII transceiver. */
 	outw(0x8040, ioaddr + Wn3_Options);
-	udelay(1000);
+	mdelay(1);
 	outw(0xc040, ioaddr + Wn3_Options);
 	wait_for_completion(dev, TxReset);
 	wait_for_completion(dev, RxReset);
-	udelay(1000);
+	mdelay(1);
 	outw(0x8040, ioaddr + Wn3_Options);
 
 	/* Switch to the stats window, and clear all stats by reading. */