diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-15 17:12:46 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-04-29 13:04:17 -0400 |
commit | 861248d177145fc5861507e4607fec89fd0a0462 (patch) | |
tree | f0d11b6c0aefc66d87b5f668e58d09884f40884b /arch/arm/mach-integrator/integrator_ap.c | |
parent | 13edd86d7a8b64735c60c308faac785a6f2257b2 (diff) |
ARM: Integrator: pass 'khz' to integrator_time_init
This is now what the clocksource/clockevent initialization functions
want, so give them the timer tick rate directly.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
-rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index cfb718fe31a8..93da7d4e459b 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c | |||
@@ -337,7 +337,7 @@ static void __init ap_init(void) | |||
337 | 337 | ||
338 | static void __init ap_init_timer(void) | 338 | static void __init ap_init_timer(void) |
339 | { | 339 | { |
340 | integrator_time_init(1000000 * TICKS_PER_uSEC / HZ, 0); | 340 | integrator_time_init(TICKS_PER_uSEC * 1000, 0); |
341 | } | 341 | } |
342 | 342 | ||
343 | static struct sys_timer ap_timer = { | 343 | static struct sys_timer ap_timer = { |