diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 11:31:38 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 11:31:38 +0100 |
commit | bea15fd77ffa1338c293328b8c74a120be53e861 (patch) | |
tree | be8ce29eee69f49fa56ee0e85d11866e07baab5e /arch/arm/mach-mmp/gplugd.c | |
parent | Merge branch 'amba' into for-armsoc (diff) | |
parent | ARM: picoxcell: remove mach/irqs.h (diff) | |
download | linux-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-mmp/gplugd.c')
-rw-r--r-- | arch/arm/mach-mmp/gplugd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c index 87765467de63..f516e74ce0d5 100644 --- a/arch/arm/mach-mmp/gplugd.c +++ b/arch/arm/mach-mmp/gplugd.c @@ -191,7 +191,7 @@ static void __init gplugd_init(void) MACHINE_START(GPLUGD, "PXA168-based GuruPlug Display (gplugD) Platform") .map_io = mmp_map_io, - .nr_irqs = IRQ_BOARD_START, + .nr_irqs = MMP_NR_IRQS, .init_irq = pxa168_init_irq, .timer = &pxa168_timer, .init_machine = gplugd_init, |