summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-06 19:50:34 +0100
committerMark Brown <broonie@linaro.org>2013-08-06 19:50:34 +0100
commit4f57f8ec238db29c5dd4ce42a6c0fbb2956a6645 (patch)
tree68f37a751f5aaf488ebc23f575fd7a2e624be402
parent2d49b5987561e480bdbd8692b27fc5f49a1e2f0b (diff)
parent49ccc142f9cbc33fdda18e8fa90c1c5b4a79c0ad (diff)
downloadlinux-4f57f8ec238db29c5dd4ce42a6c0fbb2956a6645.tar.bz2
Merge remote-tracking branch 'regmap/fix/disable' into regmap-linus
-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 75981d0b57dc..580a5320cc96 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/err.h>
struct module;
struct device;