[tip:irq/urgent] irqchip/mbigen: Make CONFIG_HISILICON_IRQ_MBIGEN a hidden option
From: tip-bot for MaJun
Date: Wed Mar 23 2016 - 07:07:30 EST
Commit-ID: 9a7c4abd41c0d553f4fb9845bdd4328155426ac7
Gitweb: http://git.kernel.org/tip/9a7c4abd41c0d553f4fb9845bdd4328155426ac7
Author: MaJun <majun258@xxxxxxxxxx>
AuthorDate: Wed, 23 Mar 2016 17:06:33 +0800
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Wed, 23 Mar 2016 12:02:29 +0100
irqchip/mbigen: Make CONFIG_HISILICON_IRQ_MBIGEN a hidden option
This config is selected by CONFIG_ARCH_HISI, so there is no point to have it
user configurable.
While at it move the config option to the proper place in the alphabetically
sorted option list.
Requested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Ma Jun <majun258@xxxxxxxxxx>
Cc: mark.rutland@xxxxxxx
Cc: jason@xxxxxxxxxxxxxx
Cc: marc.zyngier@xxxxxxx
Cc: Catalin.Marinas@xxxxxxx
Cc: guohanjun@xxxxxxxxxx
Cc: Will.Deacon@xxxxxxx
Cc: huxinwei@xxxxxxxxxx
Cc: lizefan@xxxxxxxxxx
Cc: dingtianhong@xxxxxxxxxx
Cc: zhaojunhua@xxxxxxxxxxxxx
Cc: liguozhu@xxxxxxxxxxxxx
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1458723993-21044-3-git-send-email-majun258@xxxxxxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
drivers/irqchip/Kconfig | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 7e8c441..3e12479 100644
--- 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