## Automatically generated incremental diff
## From:   linux-2.4.29-bk2
## To:     linux-2.4.29-bk3
## Robot:  $Id: make-incremental-diff,v 1.12 2004/01/06 07:19:36 hpa Exp $

diff -urN linux-2.4.29-bk2/Makefile linux-2.4.29-bk3/Makefile
--- linux-2.4.29-bk2/Makefile	2005-01-26 02:50:25.172755212 -0800
+++ linux-2.4.29-bk3/Makefile	2005-01-26 02:50:27.467855214 -0800
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 29
-EXTRAVERSION = -bk2
+EXTRAVERSION = -bk3
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.29-bk2/drivers/scsi/megaraid2.c linux-2.4.29-bk3/drivers/scsi/megaraid2.c
--- linux-2.4.29-bk2/drivers/scsi/megaraid2.c	2005-01-26 02:50:25.178755474 -0800
+++ linux-2.4.29-bk3/drivers/scsi/megaraid2.c	2004-11-17 03:54:21.000000000 -0800
@@ -2819,7 +2819,7 @@
 		}
 
 		if( iter++ < MBOX_ABORT_SLEEP*1000 ) {
-			msleep(1);
+			mdelay(1);
 		}
 		else {
 			printk(KERN_WARNING
@@ -2899,7 +2899,7 @@
 		}
 
 		if( iter++ < MBOX_RESET_SLEEP*1000 ) {
-			msleep(1);
+			mdelay(1);
 		}
 		else {
 			printk(KERN_WARNING
@@ -4040,10 +4040,10 @@
 	printk(KERN_INFO "megaraid: cache flush delay:   ");
 	for( i = 9; i >= 0; i-- ) {
 		printk("\b\b\b[%d]", i);
-		msleep(1000);
+		mdelay(1000);
 	}
 	printk("\b\b\b[done]\n");
-	msleep(1000);
+	mdelay(1000);
 
 	return NOTIFY_DONE;
 }
