From b9e659ffc7b4b607c0343c4c77992b2b940813a5 Mon Sep 17 00:00:00 2001
From: David Gibson <david@gibson.dropbear.id.au>
Date: Thu, 13 Oct 2005 15:46:22 +1000
Subject: [PATCH] --- yaml --- r: 11591 b: refs/heads/master c:
 55d363397f1bdfa4fe861f0e2fadb058c79dafea h: refs/heads/master i:   11589:
 4a6a520e5606b162d22ad5c309ea8f243a2e7a33   11587:
 f1fbfb7d46ce8da7ad0a811e0e5da2f55588cecc   11583:
 8c32a76d4e0c8d9ed6f5f386dbcc5965969cabed v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/kernel/prom_init.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 88a234f16d75..ceb9fe969e98 100644
--- 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
index d9130c839039..9b1baaa9eda0 100644
--- 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