From bec028396205917024e50f98e48ccc41640f9d4b Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
Date: Tue, 6 Sep 2011 10:23:45 +0100
Subject: [PATCH] --- yaml --- r: 279826 b: refs/heads/master c:
 abd3ca51fba8bc200ae78e99bd1ac19c4e3b6781 h: refs/heads/master v: v3

---
 [refs]                                                  | 2 +-
 trunk/arch/arm/Kconfig                                  | 1 +
 trunk/arch/arm/mach-vexpress/include/mach/entry-macro.S | 2 --
 trunk/arch/arm/mach-vexpress/v2m.c                      | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 767a0ea2b62c..2265be18f125 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b99d9ccb52d64bfdab0d58915909b10cbbdf9e1
+refs/heads/master: abd3ca51fba8bc200ae78e99bd1ac19c4e3b6781
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 5f3b7fedc662..8f39263c0768 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -311,6 +311,7 @@ config ARCH_VEXPRESS
 	select ICST
 	select PLAT_VERSATILE
 	select PLAT_VERSATILE_CLCD
+	select MULTI_IRQ_HANDLER
 	help
 	  This enables support for the ARM Ltd Versatile Express boards.
 
diff --git a/trunk/arch/arm/mach-vexpress/include/mach/entry-macro.S b/trunk/arch/arm/mach-vexpress/include/mach/entry-macro.S
index 73c11297509e..a14f9e62ca92 100644
--- a/trunk/arch/arm/mach-vexpress/include/mach/entry-macro.S
+++ b/trunk/arch/arm/mach-vexpress/include/mach/entry-macro.S
@@ -1,5 +1,3 @@
-#include <asm/hardware/entry-macro-gic.S>
-
 	.macro	disable_fiq
 	.endm
 
diff --git a/trunk/arch/arm/mach-vexpress/v2m.c b/trunk/arch/arm/mach-vexpress/v2m.c
index 1fafc3244607..7aa07a8ce232 100644
--- a/trunk/arch/arm/mach-vexpress/v2m.c
+++ b/trunk/arch/arm/mach-vexpress/v2m.c
@@ -23,6 +23,7 @@
 #include <asm/hardware/arm_timer.h>
 #include <asm/hardware/timer-sp.h>
 #include <asm/hardware/sp810.h>
+#include <asm/hardware/gic.h>
 
 #include <mach/ct-ca9x4.h>
 #include <mach/motherboard.h>
@@ -448,5 +449,6 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express")
 	.init_early	= v2m_init_early,
 	.init_irq	= v2m_init_irq,
 	.timer		= &v2m_timer,
+	.handle_irq	= gic_handle_irq,
 	.init_machine	= v2m_init,
 MACHINE_END