Merge branch 'merge'

[linux-2.6-omap-h63xx.git] / include / linux / timex.h

diff --git a/include/linux/timex.h b/include/linux/timex.h
index 82dc9ae79d37115867bb5275797e2173c605bd1f..19bb6538b49e756de59c987097f167261e240556 100644 (file)
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -53,7 +53,6 @@
 #ifndef _LINUX_TIMEX_H
 #define _LINUX_TIMEX_H
 
-#include <linux/config.h>
 #include <linux/compiler.h>
 #include <linux/time.h>
 
@@ -304,9 +303,13 @@ time_interpolator_reset(void)
 
 #endif /* !CONFIG_TIME_INTERPOLATION */
 
+#define TICK_LENGTH_SHIFT      32
+
 /* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */
 extern u64 current_tick_length(void);
 
+extern int do_adjtimex(struct timex *);
+
 #endif /* KERNEL */
 
 #endif /* LINUX_TIMEX_H */