From eeabf01fb98a51942363991c1827fe41adefba7d Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 29 Jun 2005 06:52:39 -0700 Subject: [PATCH] ARM: OMAP: Manually merged include/asm-arm/mach/time.h Manually merged include/asm-arm/mach/time.h --- include/asm-arm/mach/time.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h index c46914855bc..2cf279a4401 100644 --- a/include/asm-arm/mach/time.h +++ b/include/asm-arm/mach/time.h @@ -43,7 +43,6 @@ struct sys_timer { #ifdef CONFIG_NO_IDLE_HZ struct dyn_tick_timer *dyn_tick; #endif - }; #ifdef CONFIG_NO_IDLE_HZ @@ -56,9 +55,13 @@ struct dyn_tick_timer { unsigned int state; /* Current state */ int (*enable)(void); /* Enables dynamic tick */ int (*disable)(void); /* Disables dynamic tick */ - void (*reprogram)(void); /* Reprograms the timer */ + void (*reprogram)(unsigned long); /* Reprograms the timer */ int (*handler)(int, void *, struct pt_regs *); }; + +void timer_dyn_reprogram(void); +#else +#define timer_dyn_reprogram() do { } while (0) #endif extern struct sys_timer *system_timer; -- 2.41.1