X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fdelay.h;fp=include%2Flinux%2Fdelay.h;h=5443e1fbef0fc40b2ae5de5cd6baee24e708c435;hb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;hp=868456a624d8bce039e573353ae21550bbbf2b46;hpb=4e76c8a9fa413ccc09d3f7f664183dcce3555d57;p=linux-2.6.git

diff --git a/include/linux/delay.h b/include/linux/delay.h
index 868456a62..5443e1fbe 100644
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
@@ -25,13 +25,15 @@ extern unsigned long loops_per_jiffy;
 #define MAX_UDELAY_MS	5
 #endif
 
-#define mdelay(n) (					\
-	{						\
-		static int warned=0; 			\
-		unsigned long __ms=(n); 		\
-		WARN_ON(in_irq() && !(warned++)); 	\
-		while (__ms--) udelay(1000);		\
-	})
+#ifndef mdelay
+#define mdelay(n) (				\
+{						\
+	static int warned=0;			\
+	unsigned long __ms=(n);			\
+	WARN_ON(in_irq() && !(warned++));	\
+	while (__ms--) udelay(1000);		\
+})
+#endif
 
 #ifndef ndelay
 #define ndelay(x)	udelay(((x)+999)/1000)