]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
ARM: omap: fix typo on timer cleanup
authorOlof Johansson <olof@lixom.net>
Fri, 30 Nov 2012 07:05:32 +0000 (23:05 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 30 Nov 2012 07:16:12 +0000 (23:16 -0800)
Fix 32 vs 32k typo:

arch/arm/mach-omap2/timer.c: In function 'omap4_local_timer_init':
arch/arm/mach-omap2/timer.c:633:2: error: implicit declaration of function 'omap4_sync32_timer_init' [-Werror=implicit-function-declaration]
arch/arm/mach-omap2/timer.c: At top level:
arch/arm/mach-omap2/timer.c:610:2: warning: 'omap4_sync32k_timer_init' defined but not used [-Wunused-function]

Also, mark the omap4_local_timer_init() stub as __init (and take off
the explicit inline and let the compiler do the work instead).

Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
arch/arm/mach-omap2/timer.c

index b9cff72ceaec0c2f4b20624671ab50200ecf0bd2..7016637b531c2daf7269fcdf1c4662ce741ade7a 100644 (file)
@@ -628,9 +628,9 @@ static void __init omap4_local_timer_init(void)
        }
 }
 #else /* CONFIG_LOCAL_TIMERS */
-static inline void omap4_local_timer_init(void)
+static void __init omap4_local_timer_init(void)
 {
-       omap4_sync32_timer_init();
+       omap4_sync32k_timer_init();
 }
 #endif /* CONFIG_LOCAL_TIMERS */
 OMAP_SYS_TIMER(4, local);