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-omap3stalker.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-omap3stalker.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index ab226473deeb..b21d70a2e4a7 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
| @@ -454,6 +454,7 @@ MACHINE_START(SBC3530, "OMAP3 STALKER") | |||
| 454 | .map_io = omap3_map_io, | 454 | .map_io = omap3_map_io, |
| 455 | .init_early = omap35xx_init_early, | 455 | .init_early = omap35xx_init_early, |
| 456 | .init_irq = omap3_init_irq, | 456 | .init_irq = omap3_init_irq, |
| 457 | .handle_irq = omap3_intc_handle_irq, | ||
| 457 | .init_machine = omap3_stalker_init, | 458 | .init_machine = omap3_stalker_init, |
| 458 | .timer = &omap3_secure_timer, | 459 | .timer = &omap3_secure_timer, |
| 459 | MACHINE_END | 460 | MACHINE_END |