From 8d4484e56d50d1ab6acd630a6aba662f70ce64b0 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 27 Jan 2012 12:55:28 +0800
Subject: [PATCH] --- yaml --- r: 292081 b: refs/heads/master c:
 e24abd6ec6c2dabccb825dc41d1725bc496b3a54 h: refs/heads/master i:   292079:
 fda31ca5feeb0d5582375b366cfbe413c5f3153b v: v3

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

diff --git a/[refs] b/[refs]
index a69c8de913b2..5a9f02ae9c96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6e740304aa2a49ef09497e6c0bb906ed7987f6b
+refs/heads/master: e24abd6ec6c2dabccb825dc41d1725bc496b3a54
diff --git a/trunk/include/linux/regulator/consumer.h b/trunk/include/linux/regulator/consumer.h
index 35c42834ba3d..cef8f04efc34 100644
--- a/trunk/include/linux/regulator/consumer.h
+++ b/trunk/include/linux/regulator/consumer.h
@@ -249,6 +249,12 @@ static inline int regulator_bulk_get(struct device *dev,
 	return 0;
 }
 
+static inline int devm_regulator_bulk_get(struct device *dev, int num_consumers,
+					  struct regulator_bulk_data *consumers)
+{
+	return 0;
+}
+
 static inline int regulator_bulk_enable(int num_consumers,
 					struct regulator_bulk_data *consumers)
 {