diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 14:37:43 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 14:37:43 -0400 |
| commit | 696314cf53b7b2d1f91af6da259533eb9611e7bf (patch) | |
| tree | 8e1bf5ea4c322f8b6985b1349d768d2837e417db /arch/arm/mach-omap2/timer.c | |
| parent | 419bb4e0641cf7d84b1684b15afdd176f25c7ebe (diff) | |
| parent | e9d0b97eef235eccc3df9ddb9895b35c53a8aaa2 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index e9640728239b..cf1de7d2630d 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
| @@ -293,7 +293,8 @@ static void __init omap2_gp_clocksource_init(int gptimer_id, | |||
| 293 | pr_info("OMAP clocksource: GPTIMER%d at %lu Hz\n", | 293 | pr_info("OMAP clocksource: GPTIMER%d at %lu Hz\n", |
| 294 | gptimer_id, clksrc.rate); | 294 | gptimer_id, clksrc.rate); |
| 295 | 295 | ||
| 296 | __omap_dm_timer_load_start(clksrc.io_base, OMAP_TIMER_CTRL_ST, 0, 1); | 296 | __omap_dm_timer_load_start(clksrc.io_base, |
| 297 | OMAP_TIMER_CTRL_ST | OMAP_TIMER_CTRL_AR, 0, 1); | ||
| 297 | init_sched_clock(&cd, dmtimer_update_sched_clock, 32, clksrc.rate); | 298 | init_sched_clock(&cd, dmtimer_update_sched_clock, 32, clksrc.rate); |
| 298 | 299 | ||
| 299 | if (clocksource_register_hz(&clocksource_gpt, clksrc.rate)) | 300 | if (clocksource_register_hz(&clocksource_gpt, clksrc.rate)) |