Merge master.kernel.org:/home/rmk/linux-2.6-arm

[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..2cf279a 100644 (file)
--- a/include/asm-arm/mach/time.h
+++ b/include/asm-arm/mach/time.h
@@ -60,6 +60,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;