Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

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

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 38ea5dc8e143595fd594354b07a7a32ec88b9597..2dc42bbf6fe996cc97de4f942e9ae6863c7475e3 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -131,4 +131,21 @@ config REGULATOR_PCAP
         This driver provides support for the voltage regulators of the
         PCAP2 PMIC.
 
+config REGULATOR_MC13783
+       tristate "Support regulators on Freescale MC13783 PMIC"
+       depends on MFD_MC13783
+       help
+         Say y here to support the regulators found on the Freescale MC13783
+         PMIC.
+
+config REGULATOR_AB3100
+       tristate "ST-Ericsson AB3100 Regulator functions"
+       depends on AB3100_CORE
+       default y if AB3100_CORE
+       help
+        These regulators correspond to functionality in the
+        AB3100 analog baseband dealing with power regulators
+        for the system.
+
 endif
+