aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMyungJoo Ham <myungjoo.ham@samsung.com>2012-01-02 04:49:32 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-02 06:36:40 -0500
commit935a521066113e16c15b842852ed681bbbdfbc63 (patch)
tree616274ff1b172233d6803836ef736bae80f6aead /include/linux/regulator
parentb2296bd43e781976743354c668a356b0df98e1da (diff)
regulator: add regulator_force_disable() definition for !CONFIG_REGULATOR
regulator_force_disable() was omitted in consumer.h for !CONFIG_REGULATOR case. Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/consumer.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index f7756d146c61..889ab5aaa85b 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -212,6 +212,11 @@ static inline int regulator_disable(struct regulator *regulator)
212 return 0; 212 return 0;
213} 213}
214 214
215static inline int regulator_force_disable(struct regulator *regulator)
216{
217 return 0;
218}
219
215static inline int regulator_disable_deferred(struct regulator *regulator, 220static inline int regulator_disable_deferred(struct regulator *regulator,
216 int ms) 221 int ms)
217{ 222{