---

yaml --- r: 292082 b: refs/heads/master c: 2950c4b h: refs/heads/master v: v3
git-mirror · Jan 29, 2012 · 88800d2 · 88800d2
1 parent 8d4484e
commit 88800d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;