From: Andrew Morton <akpm@osdl.org>

Forgot to make time_interpolator_update non-static.

Please, don't put extern decls in C.  How often must this be said?

Cc: Roman Zippel <zippel@linux-m68k.org>
Acked-by: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/timex.h |    8 ++++++--
 kernel/time/ntp.c     |    6 ------
 kernel/timer.c        |    8 +-------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff -puN include/linux/timex.h~ntp-move-all-the-ntp-related-code-to-ntpc-fix include/linux/timex.h
--- a/include/linux/timex.h~ntp-move-all-the-ntp-related-code-to-ntpc-fix
+++ a/include/linux/timex.h
@@ -294,11 +294,15 @@ extern void register_time_interpolator(s
 extern void unregister_time_interpolator(struct time_interpolator *);
 extern void time_interpolator_reset(void);
 extern unsigned long time_interpolator_get_offset(void);
+extern void time_interpolator_update(long delta_nsec);
 
 #else /* !CONFIG_TIME_INTERPOLATION */
 
-static inline void
-time_interpolator_reset(void)
+static inline void time_interpolator_reset(void)
+{
+}
+
+static inline void time_interpolator_update(long delta_nsec)
 {
 }
 
diff -puN kernel/time/ntp.c~ntp-move-all-the-ntp-related-code-to-ntpc-fix kernel/time/ntp.c
--- a/kernel/time/ntp.c~ntp-move-all-the-ntp-related-code-to-ntpc-fix
+++ a/kernel/time/ntp.c
@@ -15,12 +15,6 @@
 #include <asm/div64.h>
 #include <asm/timex.h>
 
-#ifdef CONFIG_TIME_INTERPOLATION
-void time_interpolator_update(long delta_nsec);
-#else
-#define time_interpolator_update(x)
-#endif
-
 /* Don't completely fail for HZ > 500.  */
 int tickadj = 500/HZ ? : 1;		/* microsecs */
 
diff -puN kernel/timer.c~ntp-move-all-the-ntp-related-code-to-ntpc-fix kernel/timer.c
--- a/kernel/timer.c~ntp-move-all-the-ntp-related-code-to-ntpc-fix
+++ a/kernel/timer.c
@@ -41,12 +41,6 @@
 #include <asm/timex.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_TIME_INTERPOLATION
-static void time_interpolator_update(long delta_nsec);
-#else
-#define time_interpolator_update(x)
-#endif
-
 u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
 
 EXPORT_SYMBOL(jiffies_64);
@@ -1572,7 +1566,7 @@ unsigned long time_interpolator_get_offs
 #define INTERPOLATOR_ADJUST 65536
 #define INTERPOLATOR_MAX_SKIP 10*INTERPOLATOR_ADJUST
 
-static void time_interpolator_update(long delta_nsec)
+void time_interpolator_update(long delta_nsec)
 {
 	u64 counter;
 	unsigned long offset;
_