upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / include / asm-ppc / setup.h

diff --git a/include/asm-ppc/setup.h b/include/asm-ppc/setup.h
index ad1c621..b45993d 100644 (file)
--- a/include/asm-ppc/setup.h
+++ b/include/asm-ppc/setup.h
@@ -2,12 +2,17 @@
 #ifndef _PPC_SETUP_H
 #define _PPC_SETUP_H
 
-#define m68k_num_memory ppc_num_memory
-#define m68k_memory ppc_memory
+#include <linux/config.h>
+
+#ifdef CONFIG_APUS
+#define m68k_num_memory num_memory
+#define m68k_memory memory
 
 #include <asm-m68k/setup.h>
 /* We have a bigger command line buffer. */
 #undef COMMAND_LINE_SIZE
+#endif /* APUS m68k abuse */
+
 #define COMMAND_LINE_SIZE      512
 
 #endif /* _PPC_SETUP_H */