diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-11-29 23:05:32 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-29 23:16:12 -0800 |
| commit | 73f14f6d007df1596da7cea9113084acfe846b8f (patch) | |
| tree | 91f65f082a0491df206400b208d5e888fe055479 /arch/arm | |
| parent | Merge tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup (diff) | |
| download | linux-dev-73f14f6d007df1596da7cea9113084acfe846b8f.tar.xz linux-dev-73f14f6d007df1596da7cea9113084acfe846b8f.zip | |
ARM: omap: fix typo on timer cleanup
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b9cff72ceaec..7016637b531c 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -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); |