diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-29 14:35:18 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 14:35:18 +0400 |
| commit | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (patch) | |
| tree | 8627f57b3c43f3612c91760292f7e7d1b47eb3d1 /arch/arm/mach-omap2/board-omap3logic.c | |
| parent | bafe2721a0fbd1cc1af04384133684f660f3658e (diff) | |
| parent | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (diff) | |
| download | linux-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.tar.xz | |
Merge branch 'devel-timer' into devel-cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3logic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index eaefb5916595..703aeb5b8fd4 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c @@ -35,7 +35,6 @@ #include "mux.h" #include "hsmmc.h" -#include "timer-gp.h" #include "control.h" #include "common-board-devices.h" @@ -213,16 +212,16 @@ MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board") .boot_params = 0x80000100, .map_io = omap3_map_io, .init_early = omap3logic_init_early, - .init_irq = omap_init_irq, + .init_irq = omap3_init_irq, .init_machine = omap3logic_init, - .timer = &omap_timer, + .timer = &omap3_timer, MACHINE_END MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board") .boot_params = 0x80000100, .map_io = omap3_map_io, .init_early = omap3logic_init_early, - .init_irq = omap_init_irq, + .init_irq = omap3_init_irq, .init_machine = omap3logic_init, - .timer = &omap_timer, + .timer = &omap3_timer, MACHINE_END |