diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-18 12:38:25 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-18 12:38:25 -0800 |
| commit | 75d0c9e18c93428e0832c6552d0cbf395c5ebf1b (patch) | |
| tree | c51c8dd1be4b09f2ab8c1a7f66b4811c5813a4a5 /arch/arm/mach-omap2/timer-gp.c | |
| parent | 6845a44a314c0c626549de373131bf108f9cc1f1 (diff) | |
| parent | bc9fcaf3697bb4f4a7cda14d31ea4c647a6b9030 (diff) | |
Merge branch 'fixes_a_2.6.38rc' of git://git.pwsan.com/linux-2.6 into omap-fixes
Diffstat (limited to 'arch/arm/mach-omap2/timer-gp.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer-gp.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 4e48e786bec..7b7c2683ae7 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c @@ -42,6 +42,8 @@ #include "timer-gp.h" +#include <plat/common.h> + /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */ #define MAX_GPTIMER_ID 12 @@ -176,10 +178,14 @@ static void __init omap2_gp_clockevent_init(void) /* * When 32k-timer is enabled, don't use GPTimer for clocksource * instead, just leave default clocksource which uses the 32k - * sync counter. See clocksource setup in see plat-omap/common.c. + * sync counter. See clocksource setup in plat-omap/counter_32k.c */ -static inline void __init omap2_gp_clocksource_init(void) {} +static void __init omap2_gp_clocksource_init(void) +{ + omap_init_clocksource_32k(); +} + #else /* * clocksource |