From 94f493bc0cf62e775e5d3aa98e6ccf9b0402c609 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Tue, 6 Sep 2011 10:23:45 +0100 Subject: [PATCH] --- yaml --- r: 279833 b: refs/heads/master c: 368b8e252335725ea72d7bcbb3b1c8837b8dfeed h: refs/heads/master i: 279831: 6a31b41152ed2b01ccb0ca43344f7dc4566846ba v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/mach-zynq/common.c | 1 + trunk/arch/arm/mach-zynq/include/mach/entry-macro.S | 3 --- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c17e15718add..ada206556db4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ead31ee5ed00d2b95922d868cd0d63da23e47213 +refs/heads/master: 368b8e252335725ea72d7bcbb3b1c8837b8dfeed diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 21644caeb29b..d99ee9ba2324 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -979,6 +979,7 @@ config ARCH_ZYNQ select ARM_AMBA select ICST select USE_OF + select MULTI_IRQ_HANDLER help Support for Xilinx Zynq ARM Cortex A9 Platform endchoice diff --git a/trunk/arch/arm/mach-zynq/common.c b/trunk/arch/arm/mach-zynq/common.c index 73e93687b81a..ab5cfddc0d7b 100644 --- a/trunk/arch/arm/mach-zynq/common.c +++ b/trunk/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, diff --git a/trunk/arch/arm/mach-zynq/include/mach/entry-macro.S b/trunk/arch/arm/mach-zynq/include/mach/entry-macro.S index 3cfc01b37461..d621fb732569 100644 --- a/trunk/arch/arm/mach-zynq/include/mach/entry-macro.S +++ b/trunk/arch/arm/mach-zynq/include/mach/entry-macro.S @@ -20,9 +20,6 @@ * GNU General Public License for more details. */ -#include -#include - .macro disable_fiq .endm