ARM: Integrator: pass 'khz' to integrator_time_init

[net-next-2.6.git] / arch / arm / mach-integrator / core.c

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index b1ccbe3f233f864063030837b95e19f903e4eb7b..d02f0e3afdcb262ab2ae52dae27156181e58535a 100644 (file)
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -363,12 +363,12 @@ static void integrator_clockevent_init(u32 khz, unsigned int ctrl)
 /*
  * Set up timer(s).
  */
-void __init integrator_time_init(unsigned long reload, unsigned int ctrl)
+void __init integrator_time_init(u32 khz, unsigned int ctrl)
 {
        writel(0, TIMER0_VA_BASE + TIMER_CTRL);
        writel(0, TIMER1_VA_BASE + TIMER_CTRL);
        writel(0, TIMER2_VA_BASE + TIMER_CTRL);
 
-       integrator_clocksource_init(reload * HZ / 1000);
-       integrator_clockevent_init(reload * HZ / 1000, ctrl);
+       integrator_clocksource_init(khz);
+       integrator_clockevent_init(khz, ctrl);
 }