Merge tag 'irqchip-core-4.6-2' of git://git.infradead.org/users/jcooper/linux into...

[linux-beck.git] / drivers / irqchip / Kconfig

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index fb50911b3940c0bd7234a1312e320ccff020f492..0ffbdfdc41705d83411ceae8ed4f10f508f004de 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -60,6 +60,11 @@ config ARM_VIC_NR
          The maximum number of VICs available in the system, for
          power management.
 
+config ARMADA_370_XP_IRQ
+       bool
+       select GENERIC_IRQ_CHIP
+       select PCI_MSI_IRQ_DOMAIN if PCI_MSI
+
 config ATMEL_AIC_IRQ
        bool
        select GENERIC_IRQ_CHIP
@@ -78,6 +83,11 @@ config I8259
        bool
        select IRQ_DOMAIN
 
+config BCM6345_L1_IRQ
+       bool
+       select GENERIC_IRQ_CHIP
+       select IRQ_DOMAIN
+
 config BCM7038_L1_IRQ
        bool
        select GENERIC_IRQ_CHIP
@@ -151,6 +161,11 @@ config ST_IRQCHIP
        help
          Enables SysCfg Controlled IRQs on STi based platforms.
 
+config TANGO_IRQ
+       bool
+       select IRQ_DOMAIN
+       select GENERIC_IRQ_CHIP
+
 config TB10X_IRQC
        bool
        select IRQ_DOMAIN
@@ -160,6 +175,7 @@ config TS4800_IRQ
        tristate "TS-4800 IRQ controller"
        select IRQ_DOMAIN
        depends on HAS_IOMEM
+       depends on SOC_IMX51 || COMPILE_TEST
        help
          Support for the TS-4800 FPGA IRQ controller
 
@@ -218,3 +234,7 @@ config IRQ_MXS
        def_bool y if MACH_ASM9260 || ARCH_MXS
        select IRQ_DOMAIN
        select STMP_DEVICE
+
+config MVEBU_ODMI
+       bool
+       select GENERIC_MSI_IRQ_DOMAIN