summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/integrator_cp.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-01-15 22:12:46 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-04-29 18:04:17 +0100
commit861248d177145fc5861507e4607fec89fd0a0462 (patch)
treef0d11b6c0aefc66d87b5f668e58d09884f40884b /arch/arm/mach-integrator/integrator_cp.c
parent13edd86d7a8b64735c60c308faac785a6f2257b2 (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_cp.c')
-rw-r--r--arch/arm/mach-integrator/integrator_cp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 3e84732163e..108bc480237 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -572,7 +572,7 @@ static void __init intcp_init(void)
static void __init intcp_timer_init(void)
{
- integrator_time_init(1000000 / HZ, TIMER_CTRL_IE);
+ integrator_time_init(1000, TIMER_CTRL_IE);
}
static struct sys_timer cp_timer = {