diff options
author | Brian Norris <computersforpeace@gmail.com> | 2016-10-28 19:05:25 -0700 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2016-10-28 19:05:25 -0700 |
commit | 0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854 (patch) | |
tree | a3413237c8dee15dfe620848fecb37408a096345 /drivers/irqchip/Kconfig | |
parent | 30656167bd2347bf867a09cbae2705bd927d3983 (diff) | |
parent | 8ff0513bdcdd71e84aa561cce216675d43fb41b8 (diff) | |
download | talos-obmc-linux-0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854.tar.gz talos-obmc-linux-0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854.zip |
Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux
From Boris:
"""
Three simple fixes:
- the first one is fixing a non-critical bug in the gpmi driver
- the second one is fixing a bug in the 'automatic NAND timings
selection' feature introduced in 4.9-rc1
- the last one is fixing a false positive uninitialized-var warning
"""
Acked-by: Marek Vasut <marex@denx.de>
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. |