diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 10:31:38 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 10:31:38 +0000 |
| commit | bea15fd77ffa1338c293328b8c74a120be53e861 (patch) | |
| tree | be8ce29eee69f49fa56ee0e85d11866e07baab5e /arch/arm/mach-pxa/icontrol.c | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
| parent | 72ee8499eb27f5724ac97b147350a5457a598aa3 (diff) | |
| download | linux-bea15fd77ffa1338c293328b8c74a120be53e861.tar.gz linux-bea15fd77ffa1338c293328b8c74a120be53e861.tar.bz2 linux-bea15fd77ffa1338c293328b8c74a120be53e861.zip | |
Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/icontrol.c')
| -rw-r--r-- | arch/arm/mach-pxa/icontrol.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c index 67400192ed3b..1d02eabc9c65 100644 --- a/arch/arm/mach-pxa/icontrol.c +++ b/arch/arm/mach-pxa/icontrol.c @@ -193,6 +193,7 @@ static void __init icontrol_init(void) MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM") .atag_offset = 0x100, .map_io = pxa3xx_map_io, + .nr_irqs = PXA_NR_IRQS, .init_irq = pxa3xx_init_irq, .handle_irq = pxa3xx_handle_irq, .timer = &pxa_timer, |