summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/integrator_ap.c
diff options
context:
space:
mode:
authorLinus Walleij2012-02-26 10:46:48 +0100
committerRussell King2012-03-24 10:38:56 +0100
commit695436e3738ec6375a4a1026034d14433be3fb3a (patch)
tree3255d6fbe91c470f55cc4328b8c4f318a657151e /arch/arm/mach-integrator/integrator_ap.c
parentARM: 7259/3: net: JIT compiler for packet filters (diff)
downloadkernel-qcow2-linux-695436e3738ec6375a4a1026034d14433be3fb3a.tar.gz
kernel-qcow2-linux-695436e3738ec6375a4a1026034d14433be3fb3a.tar.xz
kernel-qcow2-linux-695436e3738ec6375a4a1026034d14433be3fb3a.zip
ARM: 7349/1: integrator: convert to sparse irqs
This converts the Integrator AP/CP to use sparse IRQs. Tested on both machines. Acked-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
-rw-r--r--arch/arm/mach-integrator/integrator_ap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 4dde28b9dc07..871f148ffd72 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -38,13 +38,13 @@
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/hardware/arm_timer.h>
-#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/param.h> /* HZ */
#include <asm/mach-types.h>
#include <asm/sched_clock.h>
#include <mach/lm.h>
+#include <mach/irqs.h>
#include <asm/mach/arch.h>
#include <asm/mach/irq.h>
@@ -475,6 +475,7 @@ MACHINE_START(INTEGRATOR, "ARM-Integrator")
.atag_offset = 0x100,
.reserve = integrator_reserve,
.map_io = ap_map_io,
+ .nr_irqs = NR_IRQS_INTEGRATOR_AP,
.init_early = integrator_init_early,
.init_irq = ap_init_irq,
.timer = &ap_timer,