Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

josf · Oct 27, 2014 · f3d5c5d · f3d5c5d
2 parents cac7f24 + 174e964
commit f3d5c5d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
@@ -35,6 +35,8 @@
 #ifndef __LINUX_REGULATOR_CONSUMER_H_
 #define __LINUX_REGULATOR_CONSUMER_H_
 
+#include <linux/err.h>
+
 struct device;
 struct notifier_block;
 struct regmap;