diff options
| author |   Matthias Brugger <matthias.bgg@gmail.com> | 2018-05-14 12:22:03 +0200 |
|---|---|---|
| committer | Matthias Brugger <matthias.bgg@gmail.com> | 2018-05-14 12:22:03 +0200 |
| commit | 0afd32c6bb59e41b6692dec4473efaffffcad67b (patch) | |
| tree | a8ac8cdccb1087a29e3d525c4ef1154b16f5f0ea | |
| parent | soc: mediatek: remove unneeded semicolon (diff) | |
| parent | regmap: include <linux/ktime.h> from include/linux/regmap.h (diff) | |
| download | linux-dev-0afd32c6bb59e41b6692dec4473efaffffcad67b.tar.xz linux-dev-0afd32c6bb59e41b6692dec4473efaffffcad67b.zip | |
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 @@ #include <linux/list.h> #include <linux/rbtree.h> +#include <linux/ktime.h> #include <linux/delay.h> #include <linux/err.h> #include <linux/bug.h> |