summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-27 14:26:23 +0300
committerMark Brown <broonie@kernel.org>2014-10-27 14:26:23 +0300
commitf3d5c5d8aa97d8b157337f49cbda585427920486 (patch)
tree67f5a7aa3384f46a0a871c82aa3a1039eee9b051 /include
parentcac7f2429872d3733dc3f9915857b1691da2eb2f (diff)
parent174e964ec224c3c591b83a6b5f0984d905d3678f (diff)
downloadlinux-f3d5c5d8aa97d8b157337f49cbda585427920486.tar.xz
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/consumer.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index d347c805f923..f540b1496e2f 100644
--- 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;