---

yaml --- r: 209931 b: refs/heads/master c: 6647746 h: refs/heads/master i: 209929: 5c8f109 209927: f917219 v: v3
git-mirror · Aug 23, 2010 · 005bb5f · 005bb5f
1 parent 93ea0a4
commit 005bb5f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 029b8f662b24a35aab20a81087822f1badf5463c
+refs/heads/master: 66477466b8b79c98af17f1c2267596c8b6b4b561
diff --git a/trunk/arch/powerpc/kernel/cputable.c b/trunk/arch/powerpc/kernel/cputable.c
@@ -1826,7 +1826,6 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.cpu_features		= CPU_FTRS_47X,
 		.cpu_user_features	= COMMON_USER_BOOKE |
 			PPC_FEATURE_HAS_FPU,
-		.cpu_user_features	= COMMON_USER_BOOKE,
 		.mmu_features		= MMU_FTR_TYPE_47x |
 			MMU_FTR_USE_TLBIVAX_BCAST | MMU_FTR_LOCK_BCAST_INVAL,
 		.icache_bsize		= 32,