Merge tag 'char-misc-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

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

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 903eb37f047a916d510685b7e203a4ecdb680cbd..f0cc9e6dac3ac5a3ecd7cd78ea4dd38d5f72d41c 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -266,11 +266,12 @@ config REGULATOR_LP8788
          This driver supports LP8788 voltage regulator chip.
 
 config REGULATOR_MAX14577
-       tristate "Maxim 14577 regulator"
+       tristate "Maxim 14577/77836 regulator"
        depends on MFD_MAX14577
        help
-         This driver controls a Maxim 14577 regulator via I2C bus.
-         The regulators include safeout LDO and current regulator 'CHARGER'.
+         This driver controls a Maxim MAX14577/77836 regulator via I2C bus.
+         The MAX14577 regulators include safeout LDO and charger current
+         regulator. The MAX77836 has two additional LDOs.
 
 config REGULATOR_MAX1586
        tristate "Maxim 1586/1587 voltage regulator"