diff options
| author | Olof Johansson <olof@lixom.net> | 2018-12-01 02:50:54 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-01 02:50:54 +0300 |
| commit | 3773b5c94e8a35565c99798c013043b92a49008f (patch) | |
| tree | 5ed0c159b47b71196a8f45458bc7b446afccfb45 /arch/arm/mach-omap2/timer.c | |
| parent | e47feed91a6e5954c9ad49b57319b3a706366528 (diff) | |
| parent | b76455335447fa8b73ebc0ca768e46ee74fcd329 (diff) | |
| download | linux-3773b5c94e8a35565c99798c013043b92a49008f.tar.xz | |
Merge tag 'omap-for-v4.21/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
SoC changes for omaps for v4.21 merge window
Few more non-critical section annotation fixes for Clang and
remove obsolete timer header inclusion.
* tag 'omap-for-v4.21/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: timer: Remove obsolete inclusion of <asm/smp_twd.h>
ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup
ARM: OMAP2+: hwmod: Fix some section annotations
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 98ed5ac073bc..07bea84c5d6e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -44,7 +44,6 @@ #include <linux/sched_clock.h> #include <asm/mach/time.h> -#include <asm/smp_twd.h> #include "omap_hwmod.h" #include "omap_device.h" |