From 1ca24f60df673ae145f6ea375c8f7ffbc8199881 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Tue, 6 Sep 2011 10:23:45 +0100 Subject: [PATCH] --- yaml --- r: 279824 b: refs/heads/master c: 7e01799c669c60460dce43556065ca3b66760dcf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/mach-highbank/highbank.c | 1 + trunk/arch/arm/mach-highbank/include/mach/entry-macro.S | 2 -- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fd2ae7f7fca8..ea58ee6257aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fea9fe8329c74159fb2030f1aacf29fdab9fc6d6 +refs/heads/master: 7e01799c669c60460dce43556065ca3b66760dcf diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 44789eff983f..5c014c6f056d 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -345,6 +345,7 @@ config ARCH_HIGHBANK select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU select USE_OF + select MULTI_IRQ_HANDLER help Support for the Calxeda Highbank SoC based boards. diff --git a/trunk/arch/arm/mach-highbank/highbank.c b/trunk/arch/arm/mach-highbank/highbank.c index b82dcf08e747..89bdf0039f7b 100644 --- a/trunk/arch/arm/mach-highbank/highbank.c +++ b/trunk/arch/arm/mach-highbank/highbank.c @@ -140,6 +140,7 @@ DT_MACHINE_START(HIGHBANK, "Highbank") .map_io = highbank_map_io, .init_irq = highbank_init_irq, .timer = &highbank_timer, + .handle_irq = gic_handle_irq, .init_machine = highbank_init, .dt_compat = highbank_match, MACHINE_END diff --git a/trunk/arch/arm/mach-highbank/include/mach/entry-macro.S b/trunk/arch/arm/mach-highbank/include/mach/entry-macro.S index 73c11297509e..a14f9e62ca92 100644 --- a/trunk/arch/arm/mach-highbank/include/mach/entry-macro.S +++ b/trunk/arch/arm/mach-highbank/include/mach/entry-macro.S @@ -1,5 +1,3 @@ -#include - .macro disable_fiq .endm