summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@slimlogic.co.uk>2011-08-01 18:25:06 +0100
committerLiam Girdwood <lrg@slimlogic.co.uk>2011-08-01 18:25:06 +0100
commit424c3d4a2c7d4ac3467a4849f8ccc230f670c35a (patch)
tree55806b1367b42ec210f273c16bf350182ac6fd62 /include
parent02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff)
parent88cda60e512373ca18a663ee66dc2550800223eb (diff)
downloadlinux-424c3d4a2c7d4ac3467a4849f8ccc230f670c35a.tar.bz2
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/consumer.h3
-rw-r--r--include/linux/regulator/driver.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 9e87c1cb7270..26f6ea4444e3 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -122,6 +122,9 @@ struct regulator;
struct regulator_bulk_data {
const char *supply;
struct regulator *consumer;
+
+ /* Internal use */
+ int ret;
};
#if defined(CONFIG_REGULATOR)
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 6c433b89c80d..1a80bc77517d 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -188,18 +188,16 @@ struct regulator_dev {
/* lists we belong to */
struct list_head list; /* list of all regulators */
- struct list_head slist; /* list of supplied regulators */
/* lists we own */
struct list_head consumer_list; /* consumers we supply */
- struct list_head supply_list; /* regulators we supply */
struct blocking_notifier_head notifier;
struct mutex mutex; /* consumer lock */
struct module *owner;
struct device dev;
struct regulation_constraints *constraints;
- struct regulator_dev *supply; /* for tree */
+ struct regulator *supply; /* for tree */
void *reg_data; /* regulator_dev data */