summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-prima2/common.c
diff options
context:
space:
mode:
authorBarry Song <Baohua.Song@csr.com>2012-12-20 19:11:18 +0800
committerBarry Song <Barry.Song@csr.com>2013-01-22 19:39:14 +0800
commitf2a94192d953990c5c928f52dd4122a67f93b980 (patch)
tree77bf983dc45303a627cc342939c5eee3d00087c3 /arch/arm/mach-prima2/common.c
parent598548facd3c55d1da230a2cc0e6026053b04594 (diff)
downloadlinux-f2a94192d953990c5c928f52dd4122a67f93b980.tar.gz
linux-f2a94192d953990c5c928f52dd4122a67f93b980.tar.bz2
linux-f2a94192d953990c5c928f52dd4122a67f93b980.zip
ARM: PRIMA2: irq: make prima2 irq can work even we enable GIC for Marco
in Marco, we will use GIC. this patch prepares the handle_irq for prima2 to avoid the compiling errors since we want only one defconfig and zImage for both prima2 and marco that means we will need handle_irq for both. Signed-off-by: Baohua Song <Baohua.Song@csr.com>
Diffstat (limited to 'arch/arm/mach-prima2/common.c')
-rw-r--r--arch/arm/mach-prima2/common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index 8e6f6681b546..99f9c7e391f5 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -41,6 +41,9 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
.map_io = sirfsoc_map_lluart,
.init_irq = sirfsoc_of_irq_init,
.init_time = sirfsoc_prima2_timer_init,
+#ifdef CONFIG_MULTI_IRQ_HANDLER
+ .handle_irq = sirfsoc_handle_irq,
+#endif
.dma_zone_size = SZ_256M,
.init_machine = sirfsoc_mach_init,
.init_late = sirfsoc_init_late,