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-pxa/z2.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-pxa/z2.c')
-rw-r--r-- | arch/arm/mach-pxa/z2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c index b6476848b561..fa8619970841 100644 --- a/arch/arm/mach-pxa/z2.c +++ b/arch/arm/mach-pxa/z2.c @@ -721,6 +721,7 @@ static void __init z2_init(void) MACHINE_START(ZIPIT2, "Zipit Z2") .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, |