summaryrefslogtreecommitdiff
path: root/include/linux/regulator/driver.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-10 21:15:59 +0300
committerMark Brown <broonie@kernel.org>2015-04-10 21:15:59 +0300
commit5fc31b43d59a983c47c37b7a6d327f83395609ed (patch)
treea09e68462f79fa616d08fd866764865384409b8b /include/linux/regulator/driver.h
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff)
parent498e530e50ffccb979cf5f2f2e5bbce01afe1b6e (diff)
downloadlinux-5fc31b43d59a983c47c37b7a6d327f83395609ed.tar.xz
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'include/linux/regulator/driver.h')
-rw-r--r--include/linux/regulator/driver.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 045f709cb89b..3429e81beca0 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -367,6 +367,7 @@ struct regulator_dev {
struct device dev;
struct regulation_constraints *constraints;
struct regulator *supply; /* for tree */
+ const char *supply_name;
struct regmap *regmap;
struct delayed_work disable_work;