---

yaml --- r: 86796 b: refs/heads/master c: 5cba6d2 h: refs/heads/master v: v3
git-mirror · Mar 5, 2008 · 9c5ba24 · 9c5ba24
1 parent be3fe02
commit 9c5ba24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daa49ff50a0cd1ddf88019e9afc41e26640ab1c4
+refs/heads/master: 5cba6d22e35a05adb28fdea191b232501518c455
diff --git a/trunk/include/linux/delay.h b/trunk/include/linux/delay.h
@@ -7,6 +7,8 @@
  * Delay routines, using a pre-computed "loops_per_jiffy" value.
  */
 
+#include <linux/kernel.h>
+
 extern unsigned long loops_per_jiffy;
 
 #include <asm/delay.h>
@@ -32,7 +34,11 @@ extern unsigned long loops_per_jiffy;
 #endif
 
 #ifndef ndelay
-#define ndelay(x)	udelay(((x)+999)/1000)
+static inline void ndelay(unsigned long x)
+{
+	udelay(DIV_ROUND_UP(x, 1000));
+}
+#define ndelay(x) ndelay(x)
 #endif
 
 void calibrate_delay(void);