aboutsummaryrefslogtreecommitdiff
path: root/Documentation/driver-model
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-18 21:38:28 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-18 21:38:28 +0000
commitc02f935f5f646fe1b5dbcd909e9d09c3a912914e (patch)
tree8ee7e852c33aa37dae186c89d4a9ed518be4e5fb /Documentation/driver-model
parentc592c761a36286ab83451daa37a21c8558ea99c0 (diff)
parentc1432b1ebc684890ac81915695617ff4adfec357 (diff)
Merge remote-tracking branches 'regulator/topic/devm' and 'regulator/topic/stub' into regulator-next
Diffstat (limited to 'Documentation/driver-model')
-rw-r--r--Documentation/driver-model/devres.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt
index 41c0c5d1ba1..2a596a4fc23 100644
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@ -271,3 +271,8 @@ IOMAP
pcim_iounmap()
pcim_iomap_table() : array of mapped addresses indexed by BAR
pcim_iomap_regions() : do request_region() and iomap() on multiple BARs
+
+REGULATOR
+ devm_regulator_get()
+ devm_regulator_put()
+ devm_regulator_bulk_get()