diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:39:19 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:39:19 -0400 |
| commit | 115e4bfd5bc68f870b3c889ab8f2d2733bcda452 (patch) | |
| tree | d72053747d59cd5c537919990144c078d6b8cb55 /include/linux | |
| parent | c02f935f5f646fe1b5dbcd909e9d09c3a912914e (diff) | |
| parent | 5bc78015998e14bf0362a01fc47e8b63053dbfd8 (diff) | |
Merge remote-tracking branch 'regulator/topic/supply' into regulator-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/machine.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index f3f13fd5868f..7abb16093312 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h | |||
| @@ -139,12 +139,10 @@ struct regulation_constraints { | |||
| 139 | * make struct device available late such as I2C and is the preferred | 139 | * make struct device available late such as I2C and is the preferred |
| 140 | * form. | 140 | * form. |
| 141 | * | 141 | * |
| 142 | * @dev: Device structure for the consumer. | ||
| 143 | * @dev_name: Result of dev_name() for the consumer. | 142 | * @dev_name: Result of dev_name() for the consumer. |
| 144 | * @supply: Name for the supply. | 143 | * @supply: Name for the supply. |
| 145 | */ | 144 | */ |
| 146 | struct regulator_consumer_supply { | 145 | struct regulator_consumer_supply { |
| 147 | struct device *dev; /* consumer */ | ||
| 148 | const char *dev_name; /* dev_name() for consumer */ | 146 | const char *dev_name; /* dev_name() for consumer */ |
| 149 | const char *supply; /* consumer supply - e.g. "vcc" */ | 147 | const char *supply; /* consumer supply - e.g. "vcc" */ |
| 150 | }; | 148 | }; |
