From 08e45fff151af321f6d86bb84eed365c0117dde6 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: 279832 b: refs/heads/master c:
 ead31ee5ed00d2b95922d868cd0d63da23e47213 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ce789307a11e..c17e15718add 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a83d8e27d2f6f548de54da34a9dfd7f2f7bf200e
+refs/heads/master: ead31ee5ed00d2b95922d868cd0d63da23e47213
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index d897255bcdf5..21644caeb29b 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -366,6 +366,7 @@ config ARCH_CNS3XXX
 	select ARM_GIC
 	select MIGHT_HAVE_PCI
 	select PCI_DOMAINS if PCI
+	select MULTI_IRQ_HANDLER
 	help
 	  Support for Cavium Networks CNS3XXX platform.
 
diff --git a/trunk/arch/arm/mach-cns3xxx/cns3420vb.c b/trunk/arch/arm/mach-cns3xxx/cns3420vb.c
index 55f7b4b08ab9..594852fe24cc 100644
--- a/trunk/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/trunk/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -26,6 +26,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
+#include <asm/hardware/gic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
@@ -201,5 +202,6 @@ MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board")
 	.map_io		= cns3420_map_io,
 	.init_irq	= cns3xxx_init_irq,
 	.timer		= &cns3xxx_timer,
+	.handle_irq	= gic_handle_irq,
 	.init_machine	= cns3420_init,
 MACHINE_END
diff --git a/trunk/arch/arm/mach-cns3xxx/include/mach/entry-macro.S b/trunk/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
index d87bfc397d39..01c57df5f716 100644
--- a/trunk/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
+++ b/trunk/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
@@ -8,8 +8,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <asm/hardware/entry-macro-gic.S>
-
 		.macro	disable_fiq
 		.endm