Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index e42a749a56dd..019237d21622 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -181,7 +181,7 @@ int __cpuexit __cpu_disable(void)
         /*
          * Stop the local timer for this CPU.
          */
-        local_timer_stop(cpu);
+        local_timer_stop();
 
         /*
          * Flush user cache and TLB mappings, and then remove this CPU
@@ -284,7 +284,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
         /*
          * Setup local timer for this CPU.
          */
-        local_timer_setup(cpu);
+        local_timer_setup();
 
         calibrate_delay();