diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 16:56:56 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 16:56:56 -0500 |
| commit | 2d13ccaa8797d7e599f3792aed4b1e44b47f94a5 (patch) | |
| tree | 7079c1610373fc6709c3a285a53099beaf21295a /arch/arm/mach-omap2/board-rm680.c | |
| parent | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (diff) | |
| parent | 11f1c5de7be06bbb51363002ebc4d00edc2677df (diff) | |
Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/include/mach/omap4-common.h
arch/arm/plat-omap/include/plat/irqs.h
The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved. The now empty ifdef in irqs.h
was also eliminated.
Diffstat (limited to 'arch/arm/mach-omap2/board-rm680.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rm680.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c index 6ffb6405285e..a79d49e3fe09 100644 --- a/arch/arm/mach-omap2/board-rm680.c +++ b/arch/arm/mach-omap2/board-rm680.c | |||
| @@ -149,6 +149,7 @@ MACHINE_START(NOKIA_RM680, "Nokia RM-680 board") | |||
| 149 | .map_io = omap3_map_io, | 149 | .map_io = omap3_map_io, |
| 150 | .init_early = omap3630_init_early, | 150 | .init_early = omap3630_init_early, |
| 151 | .init_irq = omap3_init_irq, | 151 | .init_irq = omap3_init_irq, |
| 152 | .handle_irq = omap3_intc_handle_irq, | ||
| 152 | .init_machine = rm680_init, | 153 | .init_machine = rm680_init, |
| 153 | .timer = &omap3_timer, | 154 | .timer = &omap3_timer, |
| 154 | MACHINE_END | 155 | MACHINE_END |