From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 10 Jun 2005 16:37:21 +0000 (-0700)
Subject: ppc: remove two extraneous descriptors for the 405EP CPU
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=90abb7b5f3bd9271a455cd640a70c285b4fd0c89;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ppc: remove two extraneous descriptors for the 405EP CPU

The patch to add them keeps on getting applied, over and
over again ;)

Hopefully no more.
---

diff --git a/arch/ppc/kernel/cputable.c b/arch/ppc/kernel/cputable.c
index ce2618ac8ac2..d44b7dc5390a 100644
--- a/arch/ppc/kernel/cputable.c
+++ b/arch/ppc/kernel/cputable.c
@@ -849,28 +849,6 @@ struct cpu_spec	cpu_specs[] = {
 		.icache_bsize		= 32,
 		.dcache_bsize		= 32,
 	},
-	{	/* 405EP */
-		.pvr_mask		= 0xffff0000,
-		.pvr_value		= 0x51210000,
-		.cpu_name		= "405EP",
-		.cpu_features		= CPU_FTR_SPLIT_ID_CACHE |
-			CPU_FTR_USE_TB,
-		.cpu_user_features	= PPC_FEATURE_32 |
-			PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
-		.icache_bsize		= 32,
-		.dcache_bsize		= 32,
-	},
-	{	/* 405EP */
-		.pvr_mask		= 0xffff0000,
-		.pvr_value		= 0x51210000,
-		.cpu_name		= "405EP",
-		.cpu_features		= CPU_FTR_SPLIT_ID_CACHE |
-			CPU_FTR_USE_TB,
-		.cpu_user_features	= PPC_FEATURE_32 |
-			PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
-		.icache_bsize		= 32,
-		.dcache_bsize		= 32,
-	},
 
 #endif /* CONFIG_40x */
 #ifdef CONFIG_44x