summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@linux.vnet.ibm.com>2010-08-18 08:44:24 +0200
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2010-08-23 13:37:01 +0200
commit66477466b8b79c98af17f1c2267596c8b6b4b561 (patch)
tree57f425318e1d7e5b8ff966a536441b30b366d037 /arch
parentpowerpc/47x: Make sure mcsr is cleared before enabling machine check interrupts (diff)
downloadlinux-66477466b8b79c98af17f1c2267596c8b6b4b561.tar.xz
linux-66477466b8b79c98af17f1c2267596c8b6b4b561.zip
powerpc/47x: Remove redundant line from cputable.c
There are two entries for .cpu_user_features in arch/powerpc/kernel/cputable.c. Remove the one that doesn't belong Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/cputable.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 65e2b4e10f97..1f9123f412ec 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/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,