diff options
| author | Matthias Brugger <matthias.bgg@gmail.com> | 2018-05-14 06:22:03 -0400 |
|---|---|---|
| committer | Matthias Brugger <matthias.bgg@gmail.com> | 2018-05-14 06:22:03 -0400 |
| commit | 0afd32c6bb59e41b6692dec4473efaffffcad67b (patch) | |
| tree | a8ac8cdccb1087a29e3d525c4ef1154b16f5f0ea | |
| parent | 5b70cba4079fdf4e281d27c2db66c13d8969f687 (diff) | |
| parent | f15cd6d99198e9c15229aefec639a34a6e8174c6 (diff) | |
Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into v.4.17-next/soc-test
| -rw-r--r-- | include/linux/regmap.h | 1 |
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 @@ | |||
| 15 | 15 | ||
| 16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 17 | #include <linux/rbtree.h> | 17 | #include <linux/rbtree.h> |
| 18 | #include <linux/ktime.h> | ||
| 18 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 19 | #include <linux/err.h> | 20 | #include <linux/err.h> |
| 20 | #include <linux/bug.h> | 21 | #include <linux/bug.h> |