Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index dd30e88..e1d9436 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -186,13 +186,25 @@ config REGULATOR_PCAP
         This driver provides support for the voltage regulators of the
         PCAP2 PMIC.
 
+config REGULATOR_MC13XXX_CORE
+       tristate
+
 config REGULATOR_MC13783
        tristate "Support regulators on Freescale MC13783 PMIC"
        depends on MFD_MC13783
+       select REGULATOR_MC13XXX_CORE
        help
          Say y here to support the regulators found on the Freescale MC13783
          PMIC.
 
+config REGULATOR_MC13892
+       tristate "Support regulators on Freescale MC13892 PMIC"
+       depends on MFD_MC13XXX
+       select REGULATOR_MC13XXX_CORE
+       help
+         Say y here to support the regulators found on the Freescale MC13892
+         PMIC.
+
 config REGULATOR_AB3100
        tristate "ST-Ericsson AB3100 Regulator functions"
        depends on AB3100_CORE
@@ -250,5 +262,15 @@ config REGULATOR_TPS6586X
        help
          This driver supports TPS6586X voltage regulator chips.
 
+config REGULATOR_TPS6524X
+       tristate "TI TPS6524X Power regulators"
+       depends on SPI
+       help
+         This driver supports TPS6524X voltage regulator chips. TPS6524X
+         provides three step-down converters and two general-purpose LDO
+         voltage regulators.  This device is interfaced using a customized
+         serial interface currently supported on the sequencer serial
+         port controller.
+
 endif