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

[karo-tx-linux.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 9869064f9f0309e4857d5584a39fabcbba27165c..75c04b8b3ec229ee444b1d0b5315d277da2990fd 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -28,16 +28,6 @@ config REGULATOR_DEBUG
        help
          Say yes here to enable debugging support.
 
-config REGULATOR_DUMMY
-       bool "Provide a dummy regulator if regulator lookups fail"
-       help
-         If this option is enabled then when a regulator lookup fails
-         and the board has not specified that it has provided full
-         constraints the regulator core will provide an always
-         enabled dummy regulator, allowing consumer drivers to continue.
-
-         A warning will be generated when this substitution is done.
-
 config REGULATOR_FIXED_VOLTAGE
        tristate "Fixed voltage regulator support"
        help