Merge tag 'for-v3.19' of git://git.infradead.org/battery-2.6

[linux-2.6-block.git] / drivers / irqchip / Kconfig

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 9efe5f10f97b477047972f5006e656f9e019e31d..cc79d2a5a8c212999ccc71da19f019ea5bf30210 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -5,8 +5,15 @@ config IRQCHIP
 config ARM_GIC
        bool
        select IRQ_DOMAIN
+       select IRQ_DOMAIN_HIERARCHY
        select MULTI_IRQ_HANDLER
 
+config ARM_GIC_V2M
+       bool
+       depends on ARM_GIC
+       depends on PCI && PCI_MSI
+       select PCI_MSI_IRQ_DOMAIN
+
 config GIC_NON_BANKED
        bool
 
@@ -14,6 +21,11 @@ config ARM_GIC_V3
        bool
        select IRQ_DOMAIN
        select MULTI_IRQ_HANDLER
+       select IRQ_DOMAIN_HIERARCHY
+
+config ARM_GIC_V3_ITS
+       bool
+       select PCI_MSI_IRQ_DOMAIN
 
 config ARM_NVIC
        bool
@@ -130,3 +142,7 @@ config KEYSTONE_IRQ
        help
                Support for Texas Instruments Keystone 2 IRQ controller IP which
                is part of the Keystone 2 IPC mechanism
+
+config MIPS_GIC
+       bool
+       select MIPS_CM