From 88800d23a7d7b5991d5174cee6fcb804c124f1e4 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Sun, 29 Jan 2012 17:52:37 +0800
Subject: [PATCH] --- yaml --- r: 292082 b: refs/heads/master c:
 2950c4bbf397fc7d3d778a97c32bba0e955b47fe h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/include/linux/regulator/consumer.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5a9f02ae9c96..6c42d6eae5df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e24abd6ec6c2dabccb825dc41d1725bc496b3a54
+refs/heads/master: 2950c4bbf397fc7d3d778a97c32bba0e955b47fe
diff --git a/trunk/include/linux/regulator/consumer.h b/trunk/include/linux/regulator/consumer.h
index cef8f04efc34..b6c8d717c7ec 100644
--- a/trunk/include/linux/regulator/consumer.h
+++ b/trunk/include/linux/regulator/consumer.h
@@ -137,7 +137,7 @@ struct regulator *__must_check devm_regulator_get(struct device *dev,
 struct regulator *__must_check regulator_get_exclusive(struct device *dev,
 						       const char *id);
 void regulator_put(struct regulator *regulator);
-void devm_regulator_free(struct regulator *regulator);
+void devm_regulator_put(struct regulator *regulator);
 
 /* regulator output control and status */
 int regulator_enable(struct regulator *regulator);
@@ -216,6 +216,10 @@ static inline void regulator_put(struct regulator *regulator)
 {
 }
 
+static inline void devm_regulator_put(struct regulator *regulator)
+{
+}
+
 static inline int regulator_enable(struct regulator *regulator)
 {
 	return 0;