diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-28 18:55:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-28 18:55:32 -0400 |
| commit | c3310e7766ebe7491910715c3161a4f29fa0112e (patch) | |
| tree | 95936f702b4c21ce30679342643da2ebf1a9f7f3 /arch/powerpc/kernel | |
| parent | 13beadd91f148933f47947a88ab2c97a1ca9768d (diff) | |
| parent | d8f48457d5af6601abdecaad7a95c45bfeef90d5 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc/ps3: Fix build error on UP
powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB
powerpc: ppc32 needs elf_read_implies_exec()
powerpc/86xx: Add device_type entry to soc for ppc9a
powerpc/44x: Correct memory size calculation for denali-based boards
maintainers: Fix PowerPC 4xx git tree
powerpc: fix for long standing bug noticed by gcc 4.4.0
Revert "powerpc: Add support for early tlbilx opcode"
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 57db50f40289..cd1b687544f3 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -1766,7 +1766,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 1766 | .cpu_features = CPU_FTRS_E500MC, | 1766 | .cpu_features = CPU_FTRS_E500MC, |
| 1767 | .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, | 1767 | .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, |
| 1768 | .mmu_features = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS | | 1768 | .mmu_features = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS | |
| 1769 | MMU_FTR_USE_TLBILX | MMU_FTR_TLBILX_EARLY_OPCODE, | 1769 | MMU_FTR_USE_TLBILX, |
| 1770 | .icache_bsize = 64, | 1770 | .icache_bsize = 64, |
| 1771 | .dcache_bsize = 64, | 1771 | .dcache_bsize = 64, |
| 1772 | .num_pmcs = 4, | 1772 | .num_pmcs = 4, |