summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Brugger <matthias.bgg@gmail.com>2018-05-14 12:22:03 +0200
committerMatthias Brugger <matthias.bgg@gmail.com>2018-05-14 12:22:03 +0200
commit0afd32c6bb59e41b6692dec4473efaffffcad67b (patch)
treea8ac8cdccb1087a29e3d525c4ef1154b16f5f0ea
parent5b70cba4079fdf4e281d27c2db66c13d8969f687 (diff)
parentf15cd6d99198e9c15229aefec639a34a6e8174c6 (diff)
Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into v.4.17-next/soc-test
-rw-r--r--include/linux/regmap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 5f7ad0552c03..b6865f070464 100644
--- 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>