From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Jun 2005 13:52:39 +0000 (-0700)
Subject: ARM: OMAP: Manually merged include/asm-arm/mach/time.h
X-Git-Tag: v2.6.13-omap1~97
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eeabf01fb98a51942363991c1827fe41adefba7d;p=linux-2.6-omap-h63xx.git

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

Manually merged include/asm-arm/mach/time.h
---

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;