Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 39360e2a454017b8007429b0397e1e44fd78a440..59822675a3e4d5b3ac8dafd03bdfe195900baecf 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -52,6 +52,13 @@ config REGULATOR_BQ24022
          charging select between 100 mA and 500 mA charging current
          limit.
 
+config REGULATOR_TWL4030
+       bool "TI TWL4030/TWL5030/TPS695x0 PMIC"
+       depends on TWL4030_CORE
+       help
+         This driver supports the voltage regulators provided by
+         this family of companion chips.
+
 config REGULATOR_WM8350
        tristate "Wolfson Microelectroncis WM8350 AudioPlus PMIC"
        depends on MFD_WM8350
@@ -73,4 +80,11 @@ config REGULATOR_DA903X
          Say y here to support the BUCKs and LDOs regulators found on
          Dialog Semiconductor DA9030/DA9034 PMIC.
 
+config REGULATOR_PCF50633
+       tristate "PCF50633 regulator driver"
+        depends on MFD_PCF50633
+       help
+        Say Y here to support the voltage regulators and convertors
+        on PCF50633
+
 endif