diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
| commit | 2cd1176bd9e92924242e779dcc5c8fc922f96659 (patch) | |
| tree | e9daa254647af2e7d9f99694e19976df0ea2a14d /arch/powerpc/kernel/cputable.c | |
| parent | a18711120764dd96ed2ee6a4d436c448542bad77 (diff) | |
| parent | e92d03bff9a0d0bcbb812c9b1290ca96c9338d45 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
| -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, |