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

mariux64 · Aug 6, 2013 · 4f57f8e · 4f57f8e
2 parents 2d49b59 + 49ccc14
commit 4f57f8e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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;