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 0765389cf5a7d629d93e20e2a9106e1b164c0ac9..59822675a3e4d5b3ac8dafd03bdfe195900baecf 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -80,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