Another maple merge tree fix

[David Gibson]

With ARCH=powerpc, a spurious ifdef in prom_init prevented the
seconday hold loop being correctly copied down on Maple.  With this
patch, Maple boots with ARCH=powerpc

Signed-off-by: David Gibson <dwg at au1.ibm.com>

Index: working-2.6/arch/powerpc/kernel/prom_init.c
===================================================================
--- working-2.6.orig/arch/powerpc/kernel/prom_init.c	2005-10-13 12:20:34.000000000 +1000
+++ working-2.6/arch/powerpc/kernel/prom_init.c	2005-10-13 15:40:59.000000000 +1000
@@ -2014,13 +2014,11 @@
 		prom_send_capabilities();
 #endif
 
-#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_BPA)
 	/*
 	 * On pSeries and BPA, copy the CPU hold code
 	 */
-       	if (RELOC(of_platform) & (PLATFORM_PSERIES | PLATFORM_BPA))
+       	if (RELOC(of_platform) != PLATFORM_POWERMAC)
        		copy_and_flush(0, KERNELBASE + offset, 0x100, 0);
-#endif
 
 	/*
 	 * Do early parsing of command line

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/people/dgibson