summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/em-x270.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-02-04 11:31:38 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-04 11:31:38 +0100
commitbea15fd77ffa1338c293328b8c74a120be53e861 (patch)
treebe8ce29eee69f49fa56ee0e85d11866e07baab5e /arch/arm/mach-pxa/em-x270.c
parentMerge branch 'amba' into for-armsoc (diff)
parentARM: picoxcell: remove mach/irqs.h (diff)
downloadlinux-bea15fd77ffa1338c293328b8c74a120be53e861.tar.xz
linux-bea15fd77ffa1338c293328b8c74a120be53e861.zip
Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/em-x270.c')
-rw-r--r--arch/arm/mach-pxa/em-x270.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index d80c0ba9a095..c1b65da26335 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -1301,6 +1301,7 @@ static void __init em_x270_init(void)
MACHINE_START(EM_X270, "Compulab EM-X270")
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
+ .nr_irqs = PXA_NR_IRQS,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
@@ -1311,6 +1312,7 @@ MACHINE_END
MACHINE_START(EXEDA, "Compulab eXeda")
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
+ .nr_irqs = PXA_NR_IRQS,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,