From 0d82e7729fde0db6b108dff33d4a43a325ecd121 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Mon, 24 Dec 2007 08:44:47 -0600
Subject: [PATCH] --- yaml --- r: 81213 b: refs/heads/master c:
 e3e414bcc2e994f98ca647f16fb31799570dc574 h: refs/heads/master i:   81211:
 ca0e8c3ed075be2d96fc1239a9dd491f235de710 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kernel/cputable.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b4a1dd2df431..42d39f0727c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cb34d291d3bcf03f284a4c44c9d618ffc278a9d
+refs/heads/master: e3e414bcc2e994f98ca647f16fb31799570dc574
diff --git a/trunk/arch/powerpc/kernel/cputable.c b/trunk/arch/powerpc/kernel/cputable.c
index 85868fc6b290..f1928af5fcfc 100644
--- a/trunk/arch/powerpc/kernel/cputable.c
+++ b/trunk/arch/powerpc/kernel/cputable.c
@@ -1369,6 +1369,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
 	},
 #endif /* CONFIG_44x */
 #ifdef CONFIG_FSL_BOOKE
+#ifdef CONFIG_E200
 	{	/* e200z5 */
 		.pvr_mask		= 0xfff00000,
 		.pvr_value		= 0x81000000,
@@ -1396,6 +1397,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.machine_check		= machine_check_e200,
 		.platform		= "ppc5554",
 	},
+#elif defined(CONFIG_E500)
 	{	/* e500 */
 		.pvr_mask		= 0xffff0000,
 		.pvr_value		= 0x80200000,
@@ -1432,6 +1434,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.platform		= "ppc8548",
 	},
 #endif
+#endif
 #if !CLASSIC_PPC
 	{	/* default match */
 		.pvr_mask		= 0x00000000,