Merge git://git.infradead.org/mtd-2.6

[sfrench/cifs-2.6.git] / include / asm-s390 / smp.h

diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h
index 444dae5912e6b544d9d31c0c45b0fcc53cefe473..9fb02e9779c9fe470d9386f02901a0ee16f46062 100644 (file)
--- a/include/asm-s390/smp.h
+++ b/include/asm-s390/smp.h
@@ -10,7 +10,6 @@
 #ifndef __ASM_SMP_H
 #define __ASM_SMP_H
 
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <linux/cpumask.h>
 #include <linux/bitops.h>
@@ -105,7 +104,7 @@ smp_call_function_on(void (*func) (void *info), void *info,
 #define smp_cpu_not_running(cpu)       1
 #define smp_get_cpu(cpu) ({ 0; })
 #define smp_put_cpu(cpu) ({ 0; })
-#define smp_setup_cpu_possible_map()
+#define smp_setup_cpu_possible_map()   do { } while (0)
 #endif
 
 #endif