diff options
author | Tony Lindgren <tony@atomide.com> | 2011-06-29 03:35:18 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 03:35:18 -0700 |
commit | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (patch) | |
tree | 8627f57b3c43f3612c91760292f7e7d1b47eb3d1 /arch/arm/mach-omap2/board-omap4panda.c | |
parent | bafe2721a0fbd1cc1af04384133684f660f3658e (diff) | |
parent | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (diff) | |
download | linux-3.10-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.tar.gz linux-3.10-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.tar.bz2 linux-3.10-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.zip |
Merge branch 'devel-timer' into devel-cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 6d2372b98e4..ee2034e3746 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -41,7 +41,6 @@ #include <plat/usb.h> #include <plat/mmc.h> #include <video/omap-panel-generic-dpi.h> -#include "timer-gp.h" #include "hsmmc.h" #include "control.h" @@ -712,5 +711,5 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") .init_early = omap4_panda_init_early, .init_irq = gic_init_irq, .init_machine = omap4_panda_init, - .timer = &omap_timer, + .timer = &omap4_timer, MACHINE_END |