From 1bc506a97a5f5540a019a31ca9a1e8179d928dcf Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 14 Mar 2013 17:30:53 +0100
Subject: [PATCH] --- yaml --- r: 370661 b: refs/heads/master c:
 2f72a682f79d4eb2d96364d1a9abb7bd16c47afb h: refs/heads/master i:   370659:
 22873134fa1907c8401b93791628f2f64d1d427c v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/Kconfig                        |  1 +
 trunk/arch/arm/mach-cns3xxx/cns3420vb.c       |  1 +
 .../arch/arm/mach-cns3xxx/include/mach/irqs.h | 24 -------------------
 4 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 trunk/arch/arm/mach-cns3xxx/include/mach/irqs.h

diff --git a/[refs] b/[refs]
index 9c415b03772a..e5492716ac5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f9fb2a08f55c79b4c6cde423c1e8ddcc5a49781
+refs/heads/master: 2f72a682f79d4eb2d96364d1a9abb7bd16c47afb
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 5b714695b01b..8bad33e4f2bd 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -390,6 +390,7 @@ config ARCH_CNS3XXX
 	select MIGHT_HAVE_CACHE_L2X0
 	select MIGHT_HAVE_PCI
 	select PCI_DOMAINS if PCI
+	select SPARSE_IRQ
 	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 d863d8729edc..ce096d678aa4 100644
--- a/trunk/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/trunk/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -246,6 +246,7 @@ static void __init cns3420_map_io(void)
 
 MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board")
 	.atag_offset	= 0x100,
+	.nr_irqs	= NR_IRQS_CNS3XXX,
 	.map_io		= cns3420_map_io,
 	.init_irq	= cns3xxx_init_irq,
 	.init_time	= cns3xxx_timer_init,
diff --git a/trunk/arch/arm/mach-cns3xxx/include/mach/irqs.h b/trunk/arch/arm/mach-cns3xxx/include/mach/irqs.h
deleted file mode 100644
index 2ab96f8085c8..000000000000
--- a/trunk/arch/arm/mach-cns3xxx/include/mach/irqs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2000 Deep Blue Solutions Ltd.
- * Copyright 2003 ARM Limited
- * Copyright 2008 Cavium Networks
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, Version 2, as
- * published by the Free Software Foundation.
- */
-
-#ifndef __MACH_IRQS_H
-#define __MACH_IRQS_H
-
-#define IRQ_LOCALTIMER		29
-#define IRQ_LOCALWDOG		30
-#define IRQ_TC11MP_GIC_START	32
-
-#include <mach/cns3xxx.h>
-
-#ifndef NR_IRQS
-#error "NR_IRQS not defined by the board-specific files"
-#endif
-
-#endif