diff options
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r-- | arch/arm/mach-omap2/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 9265e031fa2f..801287ee4d98 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
@@ -600,7 +600,7 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", | |||
600 | #endif | 600 | #endif |
601 | 601 | ||
602 | #ifdef CONFIG_ARCH_OMAP4 | 602 | #ifdef CONFIG_ARCH_OMAP4 |
603 | #ifdef CONFIG_LOCAL_TIMERS | 603 | #ifdef CONFIG_HAVE_ARM_TWD |
604 | static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); | 604 | static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); |
605 | void __init omap4_local_timer_init(void) | 605 | void __init omap4_local_timer_init(void) |
606 | { | 606 | { |
@@ -619,12 +619,12 @@ void __init omap4_local_timer_init(void) | |||
619 | pr_err("twd_local_timer_register failed %d\n", err); | 619 | pr_err("twd_local_timer_register failed %d\n", err); |
620 | } | 620 | } |
621 | } | 621 | } |
622 | #else /* CONFIG_LOCAL_TIMERS */ | 622 | #else |
623 | void __init omap4_local_timer_init(void) | 623 | void __init omap4_local_timer_init(void) |
624 | { | 624 | { |
625 | omap4_sync32k_timer_init(); | 625 | omap4_sync32k_timer_init(); |
626 | } | 626 | } |
627 | #endif /* CONFIG_LOCAL_TIMERS */ | 627 | #endif /* CONFIG_HAVE_ARM_TWD */ |
628 | #endif /* CONFIG_ARCH_OMAP4 */ | 628 | #endif /* CONFIG_ARCH_OMAP4 */ |
629 | 629 | ||
630 | #ifdef CONFIG_SOC_OMAP5 | 630 | #ifdef CONFIG_SOC_OMAP5 |