Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / irqchip / Kconfig

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index bc0af3307bbfd6612d2ae18d37a15c8d87a6ea39..125528f39e92c2377846f799a841e23ef1e98654 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -211,6 +211,10 @@ config XTENSA_MX
        bool
        select IRQ_DOMAIN
 
+config XILINX_INTC
+       bool
+       select IRQ_DOMAIN
+
 config IRQ_CROSSBAR
        bool
        help
@@ -279,3 +283,12 @@ config EZNPS_GIC
 config STM32_EXTI
        bool
        select IRQ_DOMAIN
+
+config QCOM_IRQ_COMBINER
+       bool "QCOM IRQ combiner support"
+       depends on ARCH_QCOM && ACPI
+       select IRQ_DOMAIN
+       select IRQ_DOMAIN_HIERARCHY
+       help
+         Say yes here to add support for the IRQ combiner devices embedded
+         in Qualcomm Technologies chips.