diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-29 12:35:18 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 12:35:18 +0200 |
| commit | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (patch) | |
| tree | 8627f57b3c43f3612c91760292f7e7d1b47eb3d1 /arch/arm/mach-omap2/board-ldp.c | |
| parent | omap: mcbsp: Drop in-driver transfer support (diff) | |
| parent | omap2+: Rename timer-gp.c into timer.c to combine timer init functions (diff) | |
| download | linux-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.tar.xz linux-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.zip | |
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") .reserve = omap_reserve, .map_io = omap3_map_io, .init_early = omap_ldp_init_early, - .init_irq = omap_init_irq, + .init_irq = omap3_init_irq, .init_machine = omap_ldp_init, - .timer = &omap_timer, + .timer = &omap3_timer, MACHINE_END |