From 517289974db0e6fb827dd6026130b85855dadf66 Mon Sep 17 00:00:00 2001
From: MyungJoo Ham <myungjoo.ham@samsung.com>
Date: Mon, 2 Jan 2012 18:49:32 +0900
Subject: [PATCH] --- yaml --- r: 282202 b: refs/heads/master c:
 935a521066113e16c15b842852ed681bbbdfbc63 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4220db2507d7..c3a5414c9f94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2296bd43e781976743354c668a356b0df98e1da
+refs/heads/master: 935a521066113e16c15b842852ed681bbbdfbc63
diff --git a/trunk/include/linux/regulator/consumer.h b/trunk/include/linux/regulator/consumer.h
index f7756d146c61..889ab5aaa85b 100644
--- a/trunk/include/linux/regulator/consumer.h
+++ b/trunk/include/linux/regulator/consumer.h
@@ -212,6 +212,11 @@ static inline int regulator_disable(struct regulator *regulator)
 	return 0;
 }
 
+static inline int regulator_force_disable(struct regulator *regulator)
+{
+	return 0;
+}
+
 static inline int regulator_disable_deferred(struct regulator *regulator,
 					     int ms)
 {