aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/mach-mxs.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-08-19 22:14:56 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-09-02 21:31:56 -0400
commit4e0a1b8c070fe204a406521496f01cf02c74e933 (patch)
treedf92b9a008d11710a152aa3c00167d20fc8bf773 /arch/arm/mach-mxs/mach-mxs.c
parenteeca6e604032af8336baafef84144dd47f5a0f99 (diff)
ARM: mxs: select MULTI_IRQ_HANDLER
As part of multi-platform effort, let's enable MULTI_IRQ_HANDLER for mach-mxs and remove entry-macro.S. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/mach-mxs.c')
-rw-r--r--arch/arm/mach-mxs/mach-mxs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 78bf07a8cd3c..b07af1c12cb6 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -294,6 +294,7 @@ static const char *imx28_dt_compat[] __initdata = {
294DT_MACHINE_START(IMX23, "Freescale i.MX23 (Device Tree)") 294DT_MACHINE_START(IMX23, "Freescale i.MX23 (Device Tree)")
295 .map_io = mx23_map_io, 295 .map_io = mx23_map_io,
296 .init_irq = mxs_dt_init_irq, 296 .init_irq = mxs_dt_init_irq,
297 .handle_irq = icoll_handle_irq,
297 .timer = &imx23_timer, 298 .timer = &imx23_timer,
298 .init_machine = mxs_machine_init, 299 .init_machine = mxs_machine_init,
299 .dt_compat = imx23_dt_compat, 300 .dt_compat = imx23_dt_compat,
@@ -303,6 +304,7 @@ MACHINE_END
303DT_MACHINE_START(IMX28, "Freescale i.MX28 (Device Tree)") 304DT_MACHINE_START(IMX28, "Freescale i.MX28 (Device Tree)")
304 .map_io = mx28_map_io, 305 .map_io = mx28_map_io,
305 .init_irq = mxs_dt_init_irq, 306 .init_irq = mxs_dt_init_irq,
307 .handle_irq = icoll_handle_irq,
306 .timer = &imx28_timer, 308 .timer = &imx28_timer,
307 .init_machine = mxs_machine_init, 309 .init_machine = mxs_machine_init,
308 .dt_compat = imx28_dt_compat, 310 .dt_compat = imx28_dt_compat,