Merge remote-tracking branch 'regmap/fix/disable' into regmap-linus

4f57f8ec · Mark Brown · 2d49b598 · 49ccc142 · 4f57f8ec
Commit 4f57f8ec authored Aug 06, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

include/linux/regmap.h include/linux/regmap.h +1 -0

No files found.
--- 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;