diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-15 22:02:11 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-15 22:02:11 -0800 |
commit | 017c899c2db3da481cc174049e47307ed3aba530 (patch) | |
tree | d2e55932579421d0196ac63c45bad1de8dbfa5eb /arch/arm/mach-zynq/common.c | |
parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
parent | c97136307c2cd336a3ee68cc0890b0f55d01d2d4 (diff) |
Merge branch 'omap/soc' into next/soc
Diffstat (limited to 'arch/arm/mach-zynq/common.c')
-rw-r--r-- | arch/arm/mach-zynq/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 73e93687b81..ab5cfddc0d7 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -112,6 +112,7 @@ static const char *xilinx_dt_match[] = { MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") .map_io = xilinx_map_io, .init_irq = xilinx_irq_init, + .handle_irq = gic_handle_irq, .init_machine = xilinx_init_machine, .timer = &xttcpss_sys_timer, .dt_compat = xilinx_dt_match, |