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-omap3stalker.c | |
| parent | bafe2721a0fbd1cc1af04384133684f660f3658e (diff) | |
| parent | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (diff) | |
| download | blackbird-op-linux-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.tar.gz blackbird-op-linux-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.zip | |
Merge branch 'devel-timer' into devel-cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3stalker.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 63d12a3df30a..b8ad4dd5bbbf 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c @@ -52,7 +52,6 @@ #include "sdram-micron-mt46h32m32lf-6.h" #include "mux.h" #include "hsmmc.h" -#include "timer-gp.h" #include "common-board-devices.h" #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) @@ -491,10 +490,7 @@ static void __init omap3_stalker_init_early(void) static void __init omap3_stalker_init_irq(void) { - omap_init_irq(); -#ifdef CONFIG_OMAP_32K_TIMER - omap2_gp_clockevent_set_gptimer(12); -#endif + omap3_init_irq(); } static struct platform_device *omap3_stalker_devices[] __initdata = { @@ -557,5 +553,5 @@ MACHINE_START(SBC3530, "OMAP3 STALKER") .init_early = omap3_stalker_init_early, .init_irq = omap3_stalker_init_irq, .init_machine = omap3_stalker_init, - .timer = &omap_timer, + .timer = &omap3_secure_timer, MACHINE_END |
