--- linux-2.4.0-prerelease/drivers/net/tokenring/smctr.c	Mon Oct 16 12:58:51 2000
+++ linux/drivers/net/tokenring/smctr.c	Sun Dec 31 21:23:07 2000
@@ -4445,10 +4445,10 @@
         int ioaddr = dev->base_addr;
 
         /* Reseting the NIC will put it in a halted and un-initialized state. */        smctr_set_trc_reset(ioaddr);
-        udelay(200000); /* ~2 ms */
+        udelay(2000); /* ~2 ms */
 
         smctr_clear_trc_reset(ioaddr);
-        udelay(200000); /* ~2 ms */
+        udelay(2000); /* ~2 ms */
 
         /* Remove any latched interrupts that occured prior to reseting the
          * adapter or possibily caused by line glitches due to the reset.
--- linux-2.4.0-prerelease/drivers/net/irda/toshoboe.c	Sun Nov 12 20:43:11 2000
+++ linux/drivers/net/irda/toshoboe.c	Sun Dec 31 21:23:07 2000
@@ -881,7 +892,7 @@
 static void 
 toshoboe_gotosleep (struct toshoboe_cb *self)
 {
-  int i = 10;
+  int i = 1000;
 
   printk (KERN_WARNING "ToshOboe: suspending\n");
 
@@ -896,7 +907,7 @@
 /*FIXME: can't sleep here wait one second */
 
   while ((i--) && (self->txpending))
-    udelay (100000);
+    udelay (1000);
 
   toshoboe_stopchip (self);
   toshoboe_disablebm (self);
--- linux-2.4.0-prerelease/drivers/video/atyfb.c	Sun Dec  3 17:45:23 2000
+++ linux/drivers/video/atyfb.c	Sun Dec 31 21:23:07 2000
@@ -1754,7 +1797,7 @@
     aty_st_8(CLOCK_CNTL + info->clk_wr_offset, old_clock_cntl | CLOCK_STROBE,
 	     info);
 
-    udelay(50000); /* delay for 50 (15) ms */
+    mdelay(50); /* delay for 50 (15) ms */
     aty_st_8(CLOCK_CNTL + info->clk_wr_offset,
 	     ((pll->locationAddr & 0x0F) | CLOCK_STROBE), info);
 
--- linux-2.4.0-prerelease/drivers/video/clgenfb.c	Tue Nov  7 10:59:43 2000
+++ linux/drivers/video/clgenfb.c	Sun Dec 31 21:23:07 2000
@@ -1899,7 +1926,7 @@
 		break;
 	case BT_PICASSO4:
 		vga_wcrt (fb_info->regs, CL_CRT51, 0x00);	/* disable flickerfixer */
-		udelay (100000);
+		mdelay (100);
 		vga_wgfx (fb_info->regs, CL_GR2F, 0x00);	/* from Klaus' NetBSD driver: */
 		vga_wgfx (fb_info->regs, CL_GR33, 0x00);	/* put blitter into 542x compat */
 		vga_wgfx (fb_info->regs, CL_GR31, 0x00);	/* mode */