Merge remote-tracking branches 'regulator/topic/devm' and 'regulator/topic/stub'...

[karo-tx-linux.git] / Documentation / driver-model / devres.txt

diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt
index 41c0c5d1ba145a392e17d42dc4ce8ac9c3c41a49..2a596a4fc23eeb03f1c04cbcc9415b121adfdc04 100644 (file)
--- 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()