summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:11:32 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:11:32 +0100
commit420118d48311e0c4ef4aace5aede35079ecc2412 (patch)
treea4affbc11b9271d786b9c9e5711b1e7dc873d3e8 /Documentation
parent2a2bec6554e9e9d0ae351575ca1f72df1fa0f15f (diff)
parent32dadef2190efd2e06331825b11881daf100d6d9 (diff)
downloadop-kernel-dev-420118d48311e0c4ef4aace5aede35079ecc2412.zip
op-kernel-dev-420118d48311e0c4ef4aace5aede35079ecc2412.tar.gz
Merge remote-tracking branch 'regulator/topic/alias' into regulator-next
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/driver-model/devres.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt
index fcb34a5..3d9c2a7 100644
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@ -283,6 +283,7 @@ REGULATOR
devm_regulator_get()
devm_regulator_put()
devm_regulator_bulk_get()
+ devm_regulator_register()
CLOCK
devm_clk_get()
OpenPOWER on IntegriCloud