diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-24 02:41:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-24 02:41:07 -0500 |
| commit | 2ae79026818e7d49fead82b79b1a543e3b9c8a23 (patch) | |
| tree | c7ee7bd8b37b0880918d361839fd95988fac2dac /include/clocksource/arm_arch_timer.h | |
| parent | 1a99367023f6ac664365a37fa508b059e31d0e88 (diff) | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/clocksource/arm_arch_timer.h')
| -rw-r--r-- | include/clocksource/arm_arch_timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 6d26b40cbf5d..9916d0e4eff5 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #ifndef __CLKSOURCE_ARM_ARCH_TIMER_H | 16 | #ifndef __CLKSOURCE_ARM_ARCH_TIMER_H |
| 17 | #define __CLKSOURCE_ARM_ARCH_TIMER_H | 17 | #define __CLKSOURCE_ARM_ARCH_TIMER_H |
| 18 | 18 | ||
| 19 | #include <linux/clocksource.h> | 19 | #include <linux/timecounter.h> |
| 20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 21 | 21 | ||
| 22 | #define ARCH_TIMER_CTRL_ENABLE (1 << 0) | 22 | #define ARCH_TIMER_CTRL_ENABLE (1 << 0) |