summaryrefslogtreecommitdiff
path: root/Documentation/driver-model
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-04-22 10:28:35 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-04-22 10:28:35 +0400
commit57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch)
treeee9289f0898054474b7e5054abdb3ffb78666436 /Documentation/driver-model
parent486c8aba39e5f194519cd5c0e85e5d1de8b74b03 (diff)
parent66f75a5d028beaf67c931435fdc3e7823125730c (diff)
downloadlinux-57b8628bb0ac4e47c806e45c5bbd89282e93869b.tar.xz
Merge commit 'v3.4-rc4' into 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 41c0c5d1ba14..2a596a4fc23e 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()