summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/collie.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-02-24 00:06:51 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-25 23:57:20 +0100
commitf314f33be77d6a48ae19748e3dc4a6657042b525 (patch)
tree6943191f7d9052c51dd66c4cdb99e5a265d2d0de /arch/arm/mach-sa1100/collie.c
parent3638dd2b45ceac2e9526f0ee83b0923db3546979 (diff)
downloadop-kernel-dev-f314f33be77d6a48ae19748e3dc4a6657042b525.zip
op-kernel-dev-f314f33be77d6a48ae19748e3dc4a6657042b525.tar.gz
ARM: 7342/2: sa1100: prepare for sparse irq conversion
In preparation to convert SA1100 to sparse irq, set .nr_irqs for each machine and explicitly include mach/irqs.h as needed. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/collie.c')
-rw-r--r--arch/arm/mach-sa1100/collie.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index d4339d6..48885b7 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -33,7 +33,6 @@
#include <mach/hardware.h>
#include <asm/mach-types.h>
-#include <asm/irq.h>
#include <asm/page.h>
#include <asm/setup.h>
#include <mach/collie.h>
@@ -47,6 +46,7 @@
#include <asm/mach/sharpsl_param.h>
#include <asm/hardware/locomo.h>
#include <mach/mcp.h>
+#include <mach/irqs.h>
#include "generic.h"
@@ -393,6 +393,7 @@ static void __init collie_map_io(void)
MACHINE_START(COLLIE, "Sharp-Collie")
.map_io = collie_map_io,
+ .nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
.init_machine = collie_init,
OpenPOWER on IntegriCloud