Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 144cbf5b3e5ad1bf9639d0bda4fc3dd0865b7aa0..6c88e31c01f7b11797aeeab37d622b03d720cf16 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -498,6 +498,15 @@ config REGULATOR_MT6311
          This driver supports the control of different power rails of device
          through regulator interface.
 
+config REGULATOR_MT6323
+       tristate "MediaTek MT6323 PMIC"
+       depends on MFD_MT6397
+       help
+         Say y here to select this option to enable the power regulator of
+         MediaTek MT6323 PMIC.
+         This driver supports the control of different power rails of device
+         through regulator interface.
+
 config REGULATOR_MT6397
        tristate "MediaTek MT6397 PMIC"
        depends on MFD_MT6397
@@ -543,12 +552,12 @@ config REGULATOR_PCF50633
         on PCF50633
 
 config REGULATOR_PFUZE100
-       tristate "Freescale PFUZE100/PFUZE200 regulator driver"
+       tristate "Freescale PFUZE100/200/3000 regulator driver"
        depends on I2C
        select REGMAP_I2C
        help
          Say y here to support the regulators found on the Freescale
-         PFUZE100/PFUZE200 PMIC.
+         PFUZE100/200/3000 PMIC.
 
 config REGULATOR_PV88060
        tristate "Powerventure Semiconductor PV88060 regulator"
@@ -636,10 +645,11 @@ config REGULATOR_RK808
          outputs which can be controlled by i2c communication.
 
 config REGULATOR_RN5T618
-       tristate "Ricoh RN5T618 voltage regulators"
+       tristate "Ricoh RN5T567/618 voltage regulators"
        depends on MFD_RN5T618
        help
-         Say y here to support the regulators found on Ricoh RN5T618 PMIC.
+         Say y here to support the regulators found on Ricoh RN5T567 or
+         RN5T618 PMIC.
 
 config REGULATOR_RT5033
        tristate "Richtek RT5033 Regulators"