Merge commit 'f15cd6d9' into v.4.17-next/soc-test

0afd32c6 · Matthias Brugger · 5b70cba4 · f15cd6d9 · 0afd32c6
Commit 0afd32c6 authored May 14, 2018 by Matthias Brugger
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

include/linux/regmap.h include/linux/regmap.h +1 -0

No files found.
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -15,6 +15,7 @@

 #include <linux/list.h>
 #include <linux/rbtree.h>
+#include <linux/ktime.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/bug.h>