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-omap3evm.c | |
| parent | bafe2721a0fbd1cc1af04384133684f660f3658e (diff) | |
| parent | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (diff) | |
Merge branch 'devel-timer' into devel-cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index c2ea437065c3..57bce0f2e195 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
| @@ -739,7 +739,7 @@ MACHINE_START(OMAP3EVM, "OMAP3 EVM") | |||
| 739 | .reserve = omap_reserve, | 739 | .reserve = omap_reserve, |
| 740 | .map_io = omap3_map_io, | 740 | .map_io = omap3_map_io, |
| 741 | .init_early = omap3_evm_init_early, | 741 | .init_early = omap3_evm_init_early, |
| 742 | .init_irq = omap_init_irq, | 742 | .init_irq = omap3_init_irq, |
| 743 | .init_machine = omap3_evm_init, | 743 | .init_machine = omap3_evm_init, |
| 744 | .timer = &omap_timer, | 744 | .timer = &omap3_timer, |
| 745 | MACHINE_END | 745 | MACHINE_END |