diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 13:15:43 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 13:15:43 +1000 |
commit | 1e93427b2acf579a2c31777ed8bf1f41cb228578 (patch) | |
tree | 9ce8b990616a272f388921d78a3aa6b361133e54 /include | |
parent | 956e9fc889cd5cdec316758cd4b50c68f819e14c (diff) | |
parent | 808a0875e835b7c5bde0473a54ebb19cff8c63e3 (diff) |
Merge commit 'voltage/for-next'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/regulator/machine.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index bac64fa390f2..9328090eca20 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -126,13 +126,18 @@ struct regulation_constraints { /** * struct regulator_consumer_supply - supply -> device mapping * - * This maps a supply name to a device. + * This maps a supply name to a device. Only one of dev or dev_name + * can be specified. Use of dev_name allows support for buses which + * make struct device available late such as I2C and is the preferred + * form. * * @dev: Device structure for the consumer. + * @dev_name: Result of dev_name() for the consumer. * @supply: Name for the supply. */ struct regulator_consumer_supply { struct device *dev; /* consumer */ + const char *dev_name; /* dev_name() for consumer */ const char *supply; /* consumer supply - e.g. "vcc" */ }; |