diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
| commit | b0df89868006517417251e02cc4ce5d4b0165885 (patch) | |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f /arch/arm/mach-pxa/palmt5.c | |
| parent | 4ba21e868f4b6e2ce5432055e206edadc6319533 (diff) | |
| parent | 6c634726352f0d796a4b5e6aa9849ee5b45712ce (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
Diffstat (limited to 'arch/arm/mach-pxa/palmt5.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmt5.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c index 5ba14316bd9..0f6bd4fcfa3 100644 --- a/arch/arm/mach-pxa/palmt5.c +++ b/arch/arm/mach-pxa/palmt5.c | |||
| @@ -205,6 +205,7 @@ MACHINE_START(PALMT5, "Palm Tungsten|T5") | |||
| 205 | .atag_offset = 0x100, | 205 | .atag_offset = 0x100, |
| 206 | .map_io = pxa27x_map_io, | 206 | .map_io = pxa27x_map_io, |
| 207 | .reserve = palmt5_reserve, | 207 | .reserve = palmt5_reserve, |
| 208 | .nr_irqs = PXA_NR_IRQS, | ||
| 208 | .init_irq = pxa27x_init_irq, | 209 | .init_irq = pxa27x_init_irq, |
| 209 | .handle_irq = pxa27x_handle_irq, | 210 | .handle_irq = pxa27x_handle_irq, |
| 210 | .timer = &pxa_timer, | 211 | .timer = &pxa_timer, |