From 005bb5f400d7b44f35b5b2865a1020600af0144d Mon Sep 17 00:00:00 2001 From: Dave Kleikamp Date: Wed, 18 Aug 2010 06:44:24 +0000 Subject: [PATCH] --- yaml --- r: 209931 b: refs/heads/master c: 66477466b8b79c98af17f1c2267596c8b6b4b561 h: refs/heads/master i: 209929: 5c8f109329e58f83d1a1655e693c9db7d07fe967 209927: f917219b393364d01b8ec9e2347c46fe7e3346c5 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/cputable.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index db86656de6c9..08ff68cf4b2d 100644 --- 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 index 65e2b4e10f97..1f9123f412ec 100644 --- 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,