This commit was manufactured by cvs2svn to create branch

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

diff --git a/include/asm-ppc/setup.h b/include/asm-ppc/setup.h
index d2d19ee..ad1c621 100644 (file)
--- a/include/asm-ppc/setup.h
+++ b/include/asm-ppc/setup.h
@@ -2,8 +2,8 @@
 #ifndef _PPC_SETUP_H
 #define _PPC_SETUP_H
 
-#define m68k_num_memory num_memory
-#define m68k_memory memory
+#define m68k_num_memory ppc_num_memory
+#define m68k_memory ppc_memory
 
 #include <asm-m68k/setup.h>
 /* We have a bigger command line buffer. */