diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 21:39:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 21:39:19 +0000 |
| commit | 115e4bfd5bc68f870b3c889ab8f2d2733bcda452 (patch) | |
| tree | d72053747d59cd5c537919990144c078d6b8cb55 /include/linux/regulator | |
| parent | c02f935f5f646fe1b5dbcd909e9d09c3a912914e (diff) | |
| parent | 5bc78015998e14bf0362a01fc47e8b63053dbfd8 (diff) | |
Merge remote-tracking branch 'regulator/topic/supply' into regulator-next
Diffstat (limited to 'include/linux/regulator')
| -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 f3f13fd5868..7abb1609331 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -139,12 +139,10 @@ struct regulation_constraints { * 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" */ }; |