diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/mach-omap2/board-ldp.c | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index e179da0c4da5..13bde0e66934 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | #include <plat/mcspi.h> | 37 | #include <plat/mcspi.h> |
| 38 | #include <plat/board.h> | 38 | #include <plat/board.h> |
| 39 | #include <plat/common.h> | 39 | #include "common.h" |
| 40 | #include <plat/gpmc.h> | 40 | #include <plat/gpmc.h> |
| 41 | #include <mach/board-zoom.h> | 41 | #include <mach/board-zoom.h> |
| 42 | 42 | ||
| @@ -434,6 +434,7 @@ MACHINE_START(OMAP_LDP, "OMAP LDP board") | |||
| 434 | .map_io = omap3_map_io, | 434 | .map_io = omap3_map_io, |
| 435 | .init_early = omap3430_init_early, | 435 | .init_early = omap3430_init_early, |
| 436 | .init_irq = omap3_init_irq, | 436 | .init_irq = omap3_init_irq, |
| 437 | .handle_irq = omap3_intc_handle_irq, | ||
| 437 | .init_machine = omap_ldp_init, | 438 | .init_machine = omap_ldp_init, |
| 438 | .timer = &omap3_timer, | 439 | .timer = &omap3_timer, |
| 439 | MACHINE_END | 440 | MACHINE_END |