diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-25 11:07:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-25 11:07:13 +0200 |
| commit | 3a9ff4fd04cc6ad199419508c8ea6eb839e0262d (patch) | |
| tree | f3933b082ea1743e63e93a16190c6ce32175c96a /arch/mips/Kconfig | |
| parent | 9c8783201cb58e9af8ddeb0cc68f37b0a44ca16c (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
| download | linux-3a9ff4fd04cc6ad199419508c8ea6eb839e0262d.tar.gz linux-3a9ff4fd04cc6ad199419508c8ea6eb839e0262d.tar.bz2 linux-3a9ff4fd04cc6ad199419508c8ea6eb839e0262d.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 8dd20358464f..48d91d5be4e9 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -2260,7 +2260,7 @@ config CPU_R4K_CACHE_TLB config MIPS_MT_SMP bool "MIPS MT SMP support (1 TC on each available VPE)" - depends on SYS_SUPPORTS_MULTITHREADING && !CPU_MIPSR6 + depends on SYS_SUPPORTS_MULTITHREADING && !CPU_MIPSR6 && !CPU_MICROMIPS select CPU_MIPSR2_IRQ_VI select CPU_MIPSR2_IRQ_EI select SYNC_R4K |