Commit eeabf01f authored by Tony Lindgren's avatar Tony Lindgren

ARM: OMAP: Manually merged include/asm-arm/mach/time.h

Manually merged include/asm-arm/mach/time.h
parent 2d7f0f4d
...@@ -43,7 +43,6 @@ struct sys_timer { ...@@ -43,7 +43,6 @@ struct sys_timer {
#ifdef CONFIG_NO_IDLE_HZ #ifdef CONFIG_NO_IDLE_HZ
struct dyn_tick_timer *dyn_tick; struct dyn_tick_timer *dyn_tick;
#endif #endif
}; };
#ifdef CONFIG_NO_IDLE_HZ #ifdef CONFIG_NO_IDLE_HZ
...@@ -56,9 +55,13 @@ struct dyn_tick_timer { ...@@ -56,9 +55,13 @@ struct dyn_tick_timer {
unsigned int state; /* Current state */ unsigned int state; /* Current state */
int (*enable)(void); /* Enables dynamic tick */ int (*enable)(void); /* Enables dynamic tick */
int (*disable)(void); /* Disables 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 *); int (*handler)(int, void *, struct pt_regs *);
}; };
void timer_dyn_reprogram(void);
#else
#define timer_dyn_reprogram() do { } while (0)
#endif #endif
extern struct sys_timer *system_timer; extern struct sys_timer *system_timer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment