---

yaml --- r: 282202 b: refs/heads/master c: 935a521 h: refs/heads/master v: v3
git-mirror · Jan 2, 2012 · 5172899 · 5172899
1 parent 058e990
commit 5172899
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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)
 {