summaryrefslogtreecommitdiff
path: root/drivers/clocksource/clkevt-probe.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-04-03 17:36:32 +0300
committerIngo Molnar <mingo@kernel.org>2017-04-03 17:36:32 +0300
commit7f75540ff2ca84dbac26cf9deeb620cbf5646f5e (patch)
tree1eb54748074d3a91f3dd70fb5d4b23bf713f0bd5 /drivers/clocksource/clkevt-probe.c
parent474aeffd88b87746a75583f356183d5c6caa4213 (diff)
parenta71c9a1c779f2499fb2afc0553e543f18aff6edf (diff)
downloadlinux-7f75540ff2ca84dbac26cf9deeb620cbf5646f5e.tar.xz
Merge tag 'v4.11-rc5' into x86/mm, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clocksource/clkevt-probe.c')
-rw-r--r--drivers/clocksource/clkevt-probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/clkevt-probe.c b/drivers/clocksource/clkevt-probe.c
index 8c30fec86094..eb89b502acbd 100644
--- a/drivers/clocksource/clkevt-probe.c
+++ b/drivers/clocksource/clkevt-probe.c
@@ -17,7 +17,7 @@
#include <linux/init.h>
#include <linux/of.h>
-#include <linux/clockchip.h>
+#include <linux/clockchips.h>
extern struct of_device_id __clkevt_of_table[];