summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-04-11 11:15:38 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-04-11 11:15:38 +0200
commit425b655ce479843abae07bf4dc7c496ca9538a5a (patch)
treeca816b68b513b56ca17e154f0fe7bbfd0c7296bf /arch
parentfdb7144ba36ef0c1882df3484cc9dfb7d57b2a26 (diff)
parent78223354a64284fe1ef74c5a7900435776fcf2a0 (diff)
downloadkernel-425b655ce479843abae07bf4dc7c496ca9538a5a.tar.gz
Merge tag 'irqchip-core-4.1-2' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v4.1 (round 2) from Jason Cooper - gic - Tolerate uni-processor systems better in gic_get_cpumask() - mvebu - Handle per-cpu interrupts properly - Enable PMU interrupts - Enable wakeup source - vybrid - Add MSCM interrupt router - renesas - Add PM and wakeup support
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index e8627e04e1e6..c8dffcee9736 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -631,6 +631,7 @@ config SOC_IMX6SX
config SOC_VF610
bool "Vybrid Family VF610 support"
+ select IRQ_DOMAIN_HIERARCHY
select ARM_GIC
select PINCTRL_VF610
select PL310_ERRATA_769419 if CACHE_L2X0