Merge ../ntfs-2.6-devel

[powerpc.git] / include / asm-arm / mach / time.h

diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h
index 047980a..96c6db7 100644 (file)
--- a/include/asm-arm/mach/time.h
+++ b/include/asm-arm/mach/time.h
@@ -47,9 +47,7 @@ struct sys_timer {
 
 #ifdef CONFIG_NO_IDLE_HZ
 
-#define DYN_TICK_SKIPPING      (1 << 2)
 #define DYN_TICK_ENABLED       (1 << 1)
-#define DYN_TICK_SUITABLE      (1 << 0)
 
 struct dyn_tick_timer {
        unsigned int    state;                  /* Current state */
@@ -60,6 +58,8 @@ struct dyn_tick_timer {
 };
 
 void timer_dyn_reprogram(void);
+#else
+#define timer_dyn_reprogram()  do { } while (0)
 #endif
 
 extern struct sys_timer *system_timer;