Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[~andy/linux] / include / asm-sparc / smp.h

diff --git a/include/asm-sparc/smp.h b/include/asm-sparc/smp.h
index c1a289327a79eb340ec669682c314af8b0cd5d63..b3f492208fd20168d2615a6bf51ae8a9101f63b3 100644 (file)
--- a/include/asm-sparc/smp.h
+++ b/include/asm-sparc/smp.h
@@ -6,7 +6,6 @@
 #ifndef _SPARC_SMP_H
 #define _SPARC_SMP_H
 
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <asm/head.h>
 #include <asm/btfixup.h>
@@ -166,6 +165,7 @@ void smp_setup_cpu_possible_map(void);
 
 #else /* SMP */
 
+#define hard_smp_processor_id()                0
 #define smp_setup_cpu_possible_map() do { } while (0)
 
 #endif /* !(SMP) */