From 9c5ba24046127869df6608e8a4d7797bdaaf6ff7 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 4 Mar 2008 14:28:45 -0800
Subject: [PATCH] --- yaml --- r: 86796 b: refs/heads/master c:
 5cba6d22e35a05adb28fdea191b232501518c455 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/delay.h | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 526d94ca787e..4590eee0481a 100644
--- 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
index 17ddb55430ae..54552d21296e 100644
--- 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);