---

yaml --- r: 11591 b: refs/heads/master c: 55d3633 h: refs/heads/master i: 11589: 4a6a520 11587: f1fbfb7 11583: 8c32a76 v: v3
git-mirror · Oct 17, 2005 · b9e659f · b9e659f
1 parent 0882e95
commit b9e659f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61f684ec074f40e2e13e750513df42c0c046689b
+refs/heads/master: 55d363397f1bdfa4fe861f0e2fadb058c79dafea
diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c
@@ -1955,13 +1955,11 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
 		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