diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-09 00:46:32 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-09 00:46:32 -0400 |
| commit | d660474e840a8ec5dc770f1a15d44e0045d411a6 (patch) | |
| tree | f9be76e031d9f9996111c8c4d2f3f0011f15ee4b /arch/powerpc/kernel | |
| parent | 43d795c6320fce4c1b3b38ae764fb465230745ef (diff) | |
| parent | 704102a6799ecf7c1b268a43452761dae335f29c (diff) | |
Merge remote branch 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 34d2722b9451..9fb933248ab6 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -1979,7 +1979,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 1979 | .pvr_value = 0x80240000, | 1979 | .pvr_value = 0x80240000, |
| 1980 | .cpu_name = "e5500", | 1980 | .cpu_name = "e5500", |
| 1981 | .cpu_features = CPU_FTRS_E5500, | 1981 | .cpu_features = CPU_FTRS_E5500, |
| 1982 | .cpu_user_features = COMMON_USER_BOOKE, | 1982 | .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, |
| 1983 | .mmu_features = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS | | 1983 | .mmu_features = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS | |
| 1984 | MMU_FTR_USE_TLBILX, | 1984 | MMU_FTR_USE_TLBILX, |
| 1985 | .icache_bsize = 64, | 1985 | .icache_bsize = 64, |