Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6] / include / asm-arm / smp.h

diff --git a/include/asm-arm/smp.h b/include/asm-arm/smp.h
index 1f7c51a1886d524e738613479ee2622d8df61be7..af99636db400e7e8cfbe81956faa1d84f11ebdf2 100644 (file)
--- a/include/asm-arm/smp.h
+++ b/include/asm-arm/smp.h
@@ -107,10 +107,6 @@ extern void platform_cpu_enable(unsigned int cpu);
 extern void local_timer_interrupt(void);
 
 #ifdef CONFIG_LOCAL_TIMERS
-/*
- * Setup a local timer interrupt for a CPU.
- */
-extern void local_timer_setup(unsigned int cpu);
 
 /*
  * Stop a local timer interrupt.
@@ -124,16 +120,17 @@ extern int local_timer_ack(void);
 
 #else
 
-static inline void local_timer_setup(unsigned int cpu)
-{
-}
-
 static inline void local_timer_stop(unsigned int cpu)
 {
 }
 
 #endif
 
+/*
+ * Setup a local timer interrupt for a CPU.
+ */
+extern void local_timer_setup(unsigned int cpu);
+
 /*
  * show local interrupt info
  */