Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index ea1d284..3e7a385 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -204,6 +204,17 @@ config REGULATOR_BD70528
          This driver can also be built as a module. If so, the module
          will be called bd70528-regulator.
 
+config REGULATOR_BD71815
+       tristate "ROHM BD71815 Power Regulator"
+       depends on MFD_ROHM_BD71828
+       help
+         This driver supports voltage regulators on ROHM BD71815 PMIC.
+         This will enable support for the software controllable buck
+         and LDO regulators and a current regulator for LEDs.
+
+         This driver can also be built as a module. If so, the module
+         will be called bd71815-regulator.
+
 config REGULATOR_BD71828
        tristate "ROHM BD71828 Power Regulator"
        depends on MFD_ROHM_BD71828
@@ -1020,7 +1031,7 @@ config REGULATOR_RT5033
          current source, LDO and Buck.
 
 config REGULATOR_RTMV20
-       tristate "RTMV20 Laser Diode Regulator"
+       tristate "Richtek RTMV20 Laser Diode Regulator"
        depends on I2C
        select REGMAP_I2C
        help