summaryrefslogtreecommitdiff
path: root/arch/arm/mach-zynq/common.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-16 09:21:08 +0400
committerOlof Johansson <olof@lixom.net>2011-12-16 09:21:08 +0400
commit705eb64e2ed78c63b9e2b6002b029ce8710ff7cf (patch)
treee4ad7ad6ce919dcc59460b89dfe63e9d2ff9bc63 /arch/arm/mach-zynq/common.c
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
parentf36217f3a5b5b945619192c033c2785007931e49 (diff)
downloadlinux-705eb64e2ed78c63b9e2b6002b029ce8710ff7cf.tar.xz
Merge branch 'musb' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/musb
Diffstat (limited to 'arch/arm/mach-zynq/common.c')
-rw-r--r--arch/arm/mach-zynq/common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 73e93687b81a..ab5cfddc0d7b 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,