summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pcm027.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-19 23:06:36 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-19 23:06:36 +0200
commit809b4e00baf006a990a73329ba381d536c6fa277 (patch)
treee949e0efd019d6f932537aba762792b07a84351c /arch/arm/mach-pxa/pcm027.c
parentMerge branch 'hotplug' into devel (diff)
parentMerge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff)
downloadlinux-809b4e00baf006a990a73329ba381d536c6fa277.tar.xz
linux-809b4e00baf006a990a73329ba381d536c6fa277.zip
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-pxa/pcm027.c')
-rw-r--r--arch/arm/mach-pxa/pcm027.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c
index 2190af066470..90b08ba8ad1a 100644
--- a/arch/arm/mach-pxa/pcm027.c
+++ b/arch/arm/mach-pxa/pcm027.c
@@ -262,6 +262,7 @@ MACHINE_START(PCM027, "Phytec Messtechnik GmbH phyCORE-PXA270")
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = pcm027_map_io,
+ .nr_irqs = PCM027_NR_IRQS,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.init_machine = pcm027_init,