summaryrefslogtreecommitdiff
path: root/include/soc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-05-29 23:16:45 +0300
committerArnd Bergmann <arnd@arndb.de>2020-06-02 20:14:21 +0300
commitd2353bad2c1eef7a1228645fbb21e7887c633d12 (patch)
tree4d592d4658ffb6c09c57a3d0e3ba56dfcd71c76f /include/soc
parente4df11cb99bff88cff976981eb8016ebd325a16f (diff)
downloadlinux-d2353bad2c1eef7a1228645fbb21e7887c633d12.tar.xz
ARM: omap2: fix omap5_realtime_timer_init definition
There is one more regression introduced by the last build fix: arch/arm/mach-omap2/timer.c:170:6: error: attribute declaration must precede definition [-Werror,-Wignored-attributes] void __init omap5_realtime_timer_init(void) ^ arch/arm/mach-omap2/common.h:118:20: note: previous definition is here static inline void omap5_realtime_timer_init(void) ^ arch/arm/mach-omap2/timer.c:170:13: error: redefinition of 'omap5_realtime_timer_init' void __init omap5_realtime_timer_init(void) ^ arch/arm/mach-omap2/common.h:118:20: note: previous definition is here static inline void omap5_realtime_timer_init(void) Address this by removing the now obsolete #ifdefs in that file and just building the entire file based on the flag that controls the omap5_realtime_timer_init function declaration. Link: https://lore.kernel.org/r/20200529201701.521933-1-arnd@arndb.de Fixes: d86ad463d670 ("ARM: OMAP2+: Fix regression for using local timer on non-SMP SoCs") Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/soc')
0 files changed, 0 insertions, 0 deletions