X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fdelay.h;h=868456a624d8bce039e573353ae21550bbbf2b46;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=5443e1fbef0fc40b2ae5de5cd6baee24e708c435;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

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