diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 05:31:38 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 05:31:38 -0500 |
commit | bea15fd77ffa1338c293328b8c74a120be53e861 (patch) | |
tree | be8ce29eee69f49fa56ee0e85d11866e07baab5e /arch/arm/mach-pxa/idp.c | |
parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
parent | 72ee8499eb27f5724ac97b147350a5457a598aa3 (diff) |
Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/idp.c')
-rw-r--r-- | arch/arm/mach-pxa/idp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c index 8af1840e12cc..6ff466bd43e8 100644 --- a/arch/arm/mach-pxa/idp.c +++ b/arch/arm/mach-pxa/idp.c | |||
@@ -195,6 +195,7 @@ static void __init idp_map_io(void) | |||
195 | MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") | 195 | MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") |
196 | /* Maintainer: Vibren Technologies */ | 196 | /* Maintainer: Vibren Technologies */ |
197 | .map_io = idp_map_io, | 197 | .map_io = idp_map_io, |
198 | .nr_irqs = PXA_NR_IRQS, | ||
198 | .init_irq = pxa25x_init_irq, | 199 | .init_irq = pxa25x_init_irq, |
199 | .handle_irq = pxa25x_handle_irq, | 200 | .handle_irq = pxa25x_handle_irq, |
200 | .timer = &pxa_timer, | 201 | .timer = &pxa_timer, |