Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / include / asm-i386 / cpu.h

diff --git a/include/asm-i386/cpu.h b/include/asm-i386/cpu.h
index e7252c216ca81cc8d6543f51b51fa1f8a216d194..9d914e1e4aad446e649dd8678d856768e637a38d 100644 (file)
--- a/include/asm-i386/cpu.h
+++ b/include/asm-i386/cpu.h
@@ -7,14 +7,15 @@
 #include <linux/nodemask.h>
 #include <linux/percpu.h>
 
-#include <asm/node.h>
-
 struct i386_cpu {
        struct cpu cpu;
 };
 extern int arch_register_cpu(int num);
 #ifdef CONFIG_HOTPLUG_CPU
 extern void arch_unregister_cpu(int);
+extern int enable_cpu_hotplug;
+#else
+#define enable_cpu_hotplug     0
 #endif
 
 DECLARE_PER_CPU(int, cpu_state);