diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-31 20:38:38 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-31 20:38:38 +0200 |
commit | 75eaff010547c55256f807700277365ee07d2a58 (patch) | |
tree | ccae772c0e3a20e3b52156786bed8ea8d350f4ba /arch/mips/Kconfig | |
parent | Merge tag 'stable/for-linus-3.11-rc3-tag' of git://git.kernel.org/pub/scm/lin... (diff) | |
parent | MIPS: BMIPS: fix slave CPU booting when physical CPU is not 0 (diff) | |
download | linux-75eaff010547c55256f807700277365ee07d2a58.tar.xz linux-75eaff010547c55256f807700277365ee07d2a58.zip |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
- BMIPS SMP fixes
- a build fix necessary for older compilers
- two more bugs found my Chandras' testing
- and one more build fix
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: BMIPS: fix slave CPU booting when physical CPU is not 0
MIPS: BMIPS: do not change interrupt routing depending on boot CPU
MIPS: powertv: Fix arguments for free_reserved_area()
MIPS: Set default CPU type for BCM47XX platforms
MIPS: uapi/asm/siginfo.h: Fix GCC 4.1.2 compilation
MIPS: Fix multiple definitions of UNCAC_BASE.
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index c3abed332301..e12764c2a9d0 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -114,6 +114,7 @@ config BCM47XX select FW_CFE select HW_HAS_PCI select IRQ_CPU + select SYS_HAS_CPU_MIPS32_R1 select NO_EXCEPT_FILL select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN |