Pull kmalloc into release branch

[pandora-kernel.git] / arch / ppc / boot / simple / relocate.S

diff --git a/arch/ppc/boot/simple/relocate.S b/arch/ppc/boot/simple/relocate.S
index 7efddc5..0c02155 100644 (file)
--- a/arch/ppc/boot/simple/relocate.S
+++ b/arch/ppc/boot/simple/relocate.S
@@ -13,7 +13,6 @@
  * or implied.
  */
 
-#include <linux/config.h>
 #include <asm/cache.h>
 #include <asm/ppc_asm.h>
 
@@ -194,7 +193,7 @@ start_ldr:
        /*
         * Start at the begining.
         */
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_PREP
        li      r9,0xc
        mtlr    r9
        /* tell kernel we're prep, by putting 0xdeadc0de at KERNELLOAD,