diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-11 08:27:11 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-11 08:27:11 +0100 |
commit | bfdd5537dcc857eaa04c055ef8afcb8a80dea831 (patch) | |
tree | 6336969fb04fcd0db4bcbef529f318a86dc9f7c8 /drivers/irqchip/Kconfig | |
parent | sched/core: Explain sleep/wakeup in a better way (diff) | |
parent | Merge tag 'sound-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
download | linux-bfdd5537dcc857eaa04c055ef8afcb8a80dea831.tar.xz linux-bfdd5537dcc857eaa04c055ef8afcb8a80dea831.zip |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/irqchip/Kconfig')
-rw-r--r-- | drivers/irqchip/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 82b0b5daf3f5..bc0af3307bbf 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -158,8 +158,8 @@ config PIC32_EVIC select IRQ_DOMAIN config JCORE_AIC - bool "J-Core integrated AIC" - depends on OF && (SUPERH || COMPILE_TEST) + bool "J-Core integrated AIC" if COMPILE_TEST + depends on OF select IRQ_DOMAIN help Support for the J-Core integrated AIC. |