Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / linux / delay.h

diff --git a/include/linux/delay.h b/include/linux/delay.h
index 868456a..5443e1f 100644 (file)
--- 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)