diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-22 13:09:08 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-22 13:09:08 +1000 |
| commit | ad772012bd888ef87b9c331ccef10b8b3af20d6e (patch) | |
| tree | 0b87ffe618a81e90fb400894f6c8a7f93449bde6 /include | |
| parent | 2ebecebdbf6fdd993cc92508dbfc560290a3cd94 (diff) | |
| parent | 7d51a0dbe51282f3ed13cadf6e7f13a974374be2 (diff) | |
Merge remote-tracking branch 'voltage/for-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regulator/consumer.h | 3 | ||||
| -rw-r--r-- | include/linux/regulator/driver.h | 4 |
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 */ |