From 8357fd21ca26f20108537c137c97143df9105ee8 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 13 Apr 2012 15:32:05 +0800
Subject: [PATCH] --- yaml --- r: 302199 b: refs/heads/master c:
 127ef6274a682d8ce88fd9e6614c0b30c7f8ef34 h: refs/heads/master i:   302197:
 96d91c18120ee110de1d56daeccc5a3457506609   302195:
 f494a9f329a337274140776874d32d03a4c43e75   302191:
 fb7af3c0f006afc27037ceb0550ac0e780de9c86 v: v3

---
 [refs]                                            | 2 +-
 trunk/Documentation/power/regulator/regulator.txt | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 08842427db8c..567648614857 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c8fad438200b523ec44a49b40cb8ffdf715f7c
+refs/heads/master: 127ef6274a682d8ce88fd9e6614c0b30c7f8ef34
diff --git a/trunk/Documentation/power/regulator/regulator.txt b/trunk/Documentation/power/regulator/regulator.txt
index e272d9909e39..13902778ae44 100644
--- a/trunk/Documentation/power/regulator/regulator.txt
+++ b/trunk/Documentation/power/regulator/regulator.txt
@@ -11,8 +11,7 @@ Registration
 Drivers can register a regulator by calling :-
 
 struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
-	struct device *dev, struct regulator_init_data *init_data,
-	void *driver_data, struct device_node *of_node);
+					 const struct regulator_config *config);
 
 This will register the regulators capabilities and operations to the regulator
 core.