summaryrefslogtreecommitdiff
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:11:39 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:11:39 +0100
commitaef393da7501693a1b91a1cfed1a9ea408ceabe6 (patch)
tree98af035479b8eb412a33259880a037169378cfa6 /include/linux/regulator
parent88c260a180817093682af8bd311ca141ba3952c9 (diff)
parent4040394e12cb1eed21d1306cacdc8a6f0464c8e2 (diff)
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/machine.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 8108751acb86..730e638c5589 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -195,15 +195,10 @@ int regulator_suspend_finish(void);
#ifdef CONFIG_REGULATOR
void regulator_has_full_constraints(void);
-void regulator_use_dummy_regulator(void);
#else
static inline void regulator_has_full_constraints(void)
{
}
-
-static inline void regulator_use_dummy_regulator(void)
-{
-}
#endif
#endif