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

f3d5c5d8 · Mark Brown · cac7f242 · 174e964e · f3d5c5d8
Commit f3d5c5d8 authored Oct 27, 2014 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

include/linux/regulator/consumer.h include/linux/regulator/consumer.h +2 -0

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