diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-03-02 11:59:16 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2007-03-02 12:04:16 +0000 |
| commit | 6139dbbb7769c7251e04813f577454c6c9293e15 (patch) | |
| tree | 588b44b4b8929caf812d440ec371331658fd7da3 /arch/arm/mach-omap2/timer-gp.c | |
| parent | [ARM] 4241/1: Define mb() as compiler barrier on a uniprocessor system (diff) | |
| parent | ARM: OMAP: Add missing get_irqnr_preamble and arch_ret_to_user for omap2 (diff) | |
| download | linux-dev-6139dbbb7769c7251e04813f577454c6c9293e15.tar.xz linux-dev-6139dbbb7769c7251e04813f577454c6c9293e15.zip | |
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/mach-omap2/timer-gp.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer-gp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 973189cd9766..45d1aaa51b57 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c @@ -24,6 +24,7 @@ #include <linux/err.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/irq.h> #include <asm/mach/time.h> #include <asm/arch/dmtimer.h> @@ -64,7 +65,7 @@ static void __init omap2_gp_timer_init(void) BUG_ON(gptimer == NULL); omap_dm_timer_set_source(gptimer, OMAP_TIMER_SRC_SYS_CLK); - tick_period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / 100; + tick_period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / HZ; tick_period -= 1; setup_irq(omap_dm_timer_get_irq(gptimer), &omap2_gp_timer_irq); |