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-omap1 | |
| 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-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/time.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index ed7a61ff916a..6ec65e599997 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c @@ -244,6 +244,13 @@ static void __init omap_timer_init(void) omap_init_mpu_timer(rate); omap_init_clocksource(rate); + /* + * XXX Since this file seems to deal mostly with the MPU timer, + * this doesn't seem like the correct place for the sync timer + * clocksource init. + */ + if (!cpu_is_omap7xx() && !cpu_is_omap15xx()) + omap_init_clocksource_32k(); } struct sys_timer omap_timer = { |