diff options
author | Arnd Bergmann | 2011-07-15 21:56:37 +0200 |
---|---|---|
committer | Arnd Bergmann | 2011-07-15 21:56:37 +0200 |
commit | 62778396020a29d742abf980c1e83f3df4b5426e (patch) | |
tree | 08dc01019a1afe6ed16ab79c627ecd81caea52e0 /arch/arm/plat-s5p | |
parent | 58f45e3c6f4fd2b9b9d7d43af71409a79a4b4cf6 (diff) | |
parent | d3144df5bd8eb1c8137cc92989e2e6bc9f2e5a27 (diff) |
Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/fixes
Diffstat (limited to 'arch/arm/plat-s5p')
-rw-r--r-- | arch/arm/plat-s5p/s5p-time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-s5p/s5p-time.c b/arch/arm/plat-s5p/s5p-time.c index 899a8cc011ff..612934c48b0d 100644 --- a/arch/arm/plat-s5p/s5p-time.c +++ b/arch/arm/plat-s5p/s5p-time.c @@ -370,11 +370,11 @@ static void __init s5p_clocksource_init(void) clock_rate = clk_get_rate(tin_source); - init_sched_clock(&cd, s5p_update_sched_clock, 32, clock_rate); - s5p_time_setup(timer_source.source_id, TCNT_MAX); s5p_time_start(timer_source.source_id, PERIODIC); + init_sched_clock(&cd, s5p_update_sched_clock, 32, clock_rate); + if (clocksource_register_hz(&time_clocksource, clock_rate)) panic("%s: can't register clocksource\n", time_clocksource.name); } |