summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-05-17 15:48:06 +0200
committerThomas Gleixner <tglx@linutronix.de>2019-05-17 15:48:06 +0200
commitea7a5f90f103591f1f38dede52e731ec95ef3c55 (patch)
tree3f11930376131fd86fe5390ab7e32c38ca5658f6 /include
parent13e792a19d4e3a1c64e94197ba357685fd584ded (diff)
parent8c9374068ef6dc3fdf244484b4711a6e10c84d1a (diff)
downloadlinux-ea7a5f90f103591f1f38dede52e731ec95ef3c55.tar.bz2
Merge tag 'timers-v5.2' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent updates from Daniel Lezcano: - Add compatible string for suniv for sun4i (Mesih Kilinc) - Add COMPILE_TEST option for sp804 (David Abdurachmanov) - Replace the compensation time when suspend happens on tegra with the one provided by the generic framework (Joseph Lo) - Cleanup, shutdown and oneshot mode fix on milbeaut timer (Sugaya Taichi) - Atmel TCB rework to fix boot failure on boards without PIT or misfunction on system using a preempt-rt kernel (Alexandre Belloni)
Diffstat (limited to 'include')
-rw-r--r--include/soc/at91/atmel_tcb.h (renamed from include/linux/atmel_tc.h)4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/atmel_tc.h b/include/soc/at91/atmel_tcb.h
index 468fdfa643f0..c3c7200ce151 100644
--- a/include/linux/atmel_tc.h
+++ b/include/soc/at91/atmel_tcb.h
@@ -7,8 +7,8 @@
* (at your option) any later version.
*/
-#ifndef ATMEL_TC_H
-#define ATMEL_TC_H
+#ifndef __SOC_ATMEL_TCB_H
+#define __SOC_ATMEL_TCB_H
#include <linux/compiler.h>
#include <linux/list.h>