Merge remote-tracking branch 'regulator/topic/optional' into regulator-next

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