Merge tag 'asm-generic-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

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

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 7e8c441ff2de3a66207f933e09a88e5c44a7ab07..3e124793e224f8008cbfafa8c7377c7afc4bd9fd 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -32,14 +32,6 @@ config ARM_GIC_V3_ITS
        bool
        select PCI_MSI_IRQ_DOMAIN
 
-config HISILICON_IRQ_MBIGEN
-       bool "Support mbigen interrupt controller"
-       default n
-       depends on ARM_GIC_V3 && ARM_GIC_V3_ITS && GENERIC_MSI_IRQ_DOMAIN
-       help
-        Enable the mbigen interrupt controller used on
-        Hisilicon platform.
-
 config ARM_NVIC
        bool
        select IRQ_DOMAIN
@@ -114,6 +106,12 @@ config DW_APB_ICTL
        select GENERIC_IRQ_CHIP
        select IRQ_DOMAIN
 
+config HISILICON_IRQ_MBIGEN
+       bool
+       select ARM_GIC_V3
+       select ARM_GIC_V3_ITS
+       select GENERIC_MSI_IRQ_DOMAIN
+
 config IMGPDC_IRQ
        bool
        select GENERIC_IRQ_CHIP