diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-08 11:51:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 11:51:28 +0200 |
| commit | 946e0f6ffcaa614012d646f4cf84efdd62628c8b (patch) | |
| tree | 37d31fd748f98ec4fb7897997a2745228bf0c2da /include/linux/clocksource.h | |
| parent | 67d7a982bab6702d84415ea889996fae72a7d3b2 (diff) | |
| parent | a99cde438de0c4c0cecc1d1af1a55a75b10bfdef (diff) | |
Merge tag 'v4.7-rc6' into x86/mm, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/clocksource.h')
| -rw-r--r-- | include/linux/clocksource.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index a307bf62974f..44a1aff22566 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -15,6 +15,7 @@ #include <linux/cache.h> #include <linux/timer.h> #include <linux/init.h> +#include <linux/of.h> #include <asm/div64.h> #include <asm/io.h> |