diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:32 +0100 |
| commit | 420118d48311e0c4ef4aace5aede35079ecc2412 (patch) | |
| tree | a4affbc11b9271d786b9c9e5711b1e7dc873d3e8 /include/linux/regulator/driver.h | |
| parent | 2a2bec6554e9e9d0ae351575ca1f72df1fa0f15f (diff) | |
| parent | 32dadef2190efd2e06331825b11881daf100d6d9 (diff) | |
Merge remote-tracking branch 'regulator/topic/alias' into regulator-next
Diffstat (limited to 'include/linux/regulator/driver.h')
| -rw-r--r-- | include/linux/regulator/driver.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 9bdad43ad22..779b877e0fa 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -336,7 +336,12 @@ struct regulator_dev { struct regulator_dev * regulator_register(const struct regulator_desc *regulator_desc, const struct regulator_config *config); +struct regulator_dev * +devm_regulator_register(struct device *dev, + const struct regulator_desc *regulator_desc, + const struct regulator_config *config); void regulator_unregister(struct regulator_dev *rdev); +void devm_regulator_unregister(struct device *dev, struct regulator_dev *rdev); int regulator_notifier_call_chain(struct regulator_dev *rdev, unsigned long event, void *data); |