summaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-11-03 17:32:39 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2011-11-15 18:14:04 +0000
commit11f1c5de7be06bbb51363002ebc4d00edc2677df (patch)
treecc32988e38b199db5207e32d491eb4b453c87a19 /arch/arm/common
parentc05012ce9a70100dd547042865df751498244ec3 (diff)
ARM: VIC: remove non MULTI_IRQ_HANDLER support
Now that all platforms are converted to MULTI_IRQ_HANDLER, remove the legacy support. Tested-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/Kconfig1
-rw-r--r--arch/arm/common/vic.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 10ca9749e94..81a933eb090 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -8,6 +8,7 @@ config GIC_NON_BANKED
config ARM_VIC
select IRQ_DOMAIN
+ select MULTI_IRQ_HANDLER
bool
config ARM_VIC_NR
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 0a69547e031..6ed41ec2bbf 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -430,7 +430,6 @@ int __init vic_of_init(struct device_node *node, struct device_node *parent)
}
#endif /* CONFIG OF */
-#ifdef CONFIG_MULTI_IRQ_HANDLER
/*
* Handle each interrupt in a single VIC. Returns non-zero if we've
* handled at least one interrupt. This does a single read of the
@@ -465,4 +464,3 @@ asmlinkage void __exception_irq_entry vic_handle_irq(struct pt_regs *regs)
handled |= handle_one_vic(&vic_devices[i], regs);
} while (handled);
}
-#endif /* CONFIG_MULTI_IRQ_HANDLER */