diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-29 06:35:18 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 06:35:18 -0400 |
| commit | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (patch) | |
| tree | 8627f57b3c43f3612c91760292f7e7d1b47eb3d1 /arch/arm/mach-omap2/board-ldp.c | |
| parent | bafe2721a0fbd1cc1af04384133684f660f3658e (diff) | |
| parent | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (diff) | |
Merge branch 'devel-timer' into devel-cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 2d7e0aed605e..5d4328f19c0f 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
| @@ -348,7 +348,7 @@ MACHINE_START(OMAP_LDP, "OMAP LDP board") | |||
| 348 | .reserve = omap_reserve, | 348 | .reserve = omap_reserve, |
| 349 | .map_io = omap3_map_io, | 349 | .map_io = omap3_map_io, |
| 350 | .init_early = omap_ldp_init_early, | 350 | .init_early = omap_ldp_init_early, |
| 351 | .init_irq = omap_init_irq, | 351 | .init_irq = omap3_init_irq, |
| 352 | .init_machine = omap_ldp_init, | 352 | .init_machine = omap_ldp_init, |
| 353 | .timer = &omap_timer, | 353 | .timer = &omap3_timer, |
| 354 | MACHINE_END | 354 | MACHINE_END |