This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/asm-arm/delay.h b/include/asm-arm/delay.h
index 1704360..4ebcea0 100644 (file)
--- a/include/asm-arm/delay.h
+++ b/include/asm-arm/delay.h
@@ -1,21 +1,13 @@
-/*
- * Copyright (C) 1995-2004 Russell King
- *
- * Delay routines, using a pre-computed "loops_per_second" value.
- */
 #ifndef __ASM_ARM_DELAY_H
 #define __ASM_ARM_DELAY_H
 
-extern void __delay(int loops);
-
 /*
- * This function intentionally does not exist; if you see references to
- * it, it means that you're calling udelay() with an out of range value.
+ * Copyright (C) 1995 Russell King
  *
- * With currently imposed limits, this means that we support a max delay
- * of 2000us and 671 bogomips
+ * Delay routines, using a pre-computed "loops_per_second" value.
  */
-extern void __bad_udelay(void);
+
+extern void __delay(int loops);
 
 /*
  * division by multiplication: you don't have to worry about
@@ -27,16 +19,14 @@ extern void __bad_udelay(void);
  * first constant multiplications gets optimized away if the delay is
  * a constant)
  */
-extern void __udelay(unsigned long usecs);
-extern void __const_udelay(unsigned long);
+extern void udelay(unsigned long usecs);
 
-#define MAX_UDELAY_MS 2
+static inline unsigned long muldiv(unsigned long a, unsigned long b, unsigned long c)
+{
+       return a * b / c;
+}
 
-#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) */