aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regmap.h
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-10-13 19:07:54 +0900
committerMark Brown <broonie@kernel.org>2016-10-13 16:44:04 +0200
commitadf08d481b52824c87af028fc74dc692d179f7f4 (patch)
tree65c4e830454c3ae729f2dacffe1338c5401566ca /include/linux/regmap.h
parentMerge remote-tracking branches 'regmap/topic/core' and 'regmap/topic/debugfs' into regmap-next (diff)
downloadlinux-dev-adf08d481b52824c87af028fc74dc692d179f7f4.tar.xz
linux-dev-adf08d481b52824c87af028fc74dc692d179f7f4.zip
regmap: include <linux/delay.h> from include/linux/regmap.h
The readx_poll_timeout() macro calls usleep_range(), which is declared in <linux/delay.h>. Make include/linux/regmap.h include <linux/delay.h>, like include/linux/iopoll.h does. Otherwise, users of the macro will see "implicit declaration of function 'usleep_range'" error. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/linux/regmap.h')
-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 9adc7b21903d..e5157e39ff22 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/delay.h>
#include <linux/err.h>
#include <linux/bug.h>
#include <linux/lockdep.h>