X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Fdelay.h;fp=include%2Fasm-arm%2Fdelay.h;h=1704360e969964e9f59063ab862163fee4f52231;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=b2deda1815496d83ab3dde5c9eb2c4f5194c7b1e;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/asm-arm/delay.h b/include/asm-arm/delay.h
index b2deda181..1704360e9 100644
--- a/include/asm-arm/delay.h
+++ b/include/asm-arm/delay.h
@@ -6,8 +6,6 @@
 #ifndef __ASM_ARM_DELAY_H
 #define __ASM_ARM_DELAY_H
 
-#include <asm/param.h>	/* HZ */
-
 extern void __delay(int loops);
 
 /*
@@ -15,7 +13,7 @@ extern void __delay(int loops);
  * it, it means that you're calling udelay() with an out of range value.
  *
  * With currently imposed limits, this means that we support a max delay
- * of 2000us. Further limits: HZ<=1000 and bogomips<=3355
+ * of 2000us and 671 bogomips
  */
 extern void __bad_udelay(void);
 
@@ -34,10 +32,10 @@ extern void __const_udelay(unsigned long);
 
 #define MAX_UDELAY_MS 2
 
-#define udelay(n)							\
-	(__builtin_constant_p(n) ?					\
-	  ((n) > (MAX_UDELAY_MS * 1000) ? __bad_udelay() :		\
-			__const_udelay((n) * ((2199023U*HZ)>>11))) :	\
+#define udelay(n)						\
+	(__builtin_constant_p(n) ?				\
+	  ((n) > (MAX_UDELAY_MS * 1000) ? __bad_udelay() :	\
+			__const_udelay((n) * 0x68dbul)) :	\
 	  __udelay(n))
 
 #endif /* defined(_ARM_DELAY_H) */