Merge remote-tracking branches 'regulator/topic/da9063', 'regulator/topic/doc', ...

[platform/kernel/linux-exynos.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index a6f116a..4d6d126 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -178,6 +178,16 @@ config REGULATOR_DA9055
          This driver can also be built as a module. If so, the module
          will be called da9055-regulator.
 
+config REGULATOR_DA9062
+       tristate "Dialog Semiconductor DA9062 regulators"
+       depends on MFD_DA9062
+       help
+         Say y here to support the BUCKs and LDOs regulators found on
+         DA9062 PMICs.
+
+         This driver can also be built as a module. If so, the module
+         will be called da9062-regulator.
+
 config REGULATOR_DA9063
        tristate "Dialog Semiconductor DA9063 regulators"
        depends on MFD_DA9063
@@ -233,7 +243,7 @@ config REGULATOR_FAN53555
 
 config REGULATOR_GPIO
        tristate "GPIO regulator support"
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        help
          This driver provides support for regulators that can be
          controlled via gpios.