Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
index c60024989ebd59b70bd090d01cc0ada6a95ad9d4..6314b29e8c4d6e32f249f3fb9376bc02e86ec729 100644 (file)
--- a/include/asm-ia64/smp.h
+++ b/include/asm-ia64/smp.h
@@ -116,7 +116,6 @@ max_xtp (void)
 extern int __cpu_disable (void);
 extern void __cpu_die (unsigned int cpu);
 extern void cpu_die (void) __attribute__ ((noreturn));
-extern int __cpu_up (unsigned int cpu);
 extern void __init smp_build_cpu_map(void);
 
 extern void __init init_smp_config (void);