aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/integrator_ap.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_ap.c
parentARM: Integrator: convert to generic clockevent support (diff)
downloadlinux-dev-861248d177145fc5861507e4607fec89fd0a0462.tar.xz
linux-dev-861248d177145fc5861507e4607fec89fd0a0462.zip
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.c2
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)
static void __init ap_init_timer(void)
{
- integrator_time_init(1000000 * TICKS_PER_uSEC / HZ, 0);
+ integrator_time_init(TICKS_PER_uSEC * 1000, 0);
}
static struct sys_timer ap_timer = {