From db821924cd624850c8afc287bb800cfc168b3c3d Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 23 Apr 2013 23:16:44 +0200 Subject: [PATCH] --- yaml --- r: 374201 b: refs/heads/master c: 405f5e5ee53339cf5d5d1753f8614938b1222562 h: refs/heads/master i: 374199: 050bcecb6b113586f9fb92e3b4fa8fd06b20fb24 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/timer.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4df5cb43f9b5..528736f8af2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3e0c873d0653e6e7628b5a8a9fcb3745444ca9e +refs/heads/master: 405f5e5ee53339cf5d5d1753f8614938b1222562 diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c index d5a13dcb64b8..31109cb3f464 100644 --- a/trunk/arch/arm/mach-omap2/timer.c +++ b/trunk/arch/arm/mach-omap2/timer.c @@ -621,12 +621,10 @@ void __init omap4_local_timer_init(void) #ifdef CONFIG_SOC_OMAP5 void __init omap5_realtime_timer_init(void) { - int err; - omap4_sync32k_timer_init(); realtime_counter_init(); - clocksource_of_init(); + clocksource_of_init(); } #endif /* CONFIG_SOC_OMAP5 */