aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100/jornada720.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/jornada720.c
parent3638dd2b45ceac2e9526f0ee83b0923db3546979 (diff)
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/jornada720.c')
-rw-r--r--arch/arm/mach-sa1100/jornada720.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 8be8130baf63..b7dcb1887aca 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -23,9 +23,7 @@
#include <linux/mtd/partitions.h>
#include <video/s1d13xxxfb.h>
-#include <mach/hardware.h>
#include <asm/hardware/sa1111.h>
-#include <asm/irq.h>
#include <asm/page.h>
#include <asm/mach-types.h>
#include <asm/setup.h>
@@ -34,6 +32,9 @@
#include <asm/mach/map.h>
#include <asm/mach/serial_sa1100.h>
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+
#include "generic.h"
/*
@@ -344,6 +345,7 @@ MACHINE_START(JORNADA720, "HP Jornada 720")
/* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */
.atag_offset = 0x100,
.map_io = jornada720_map_io,
+ .nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
.init_machine = jornada720_mach_init,