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 ce17a03..e1d9436 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -187,7 +187,7 @@ config REGULATOR_PCAP
         PCAP2 PMIC.
 
 config REGULATOR_MC13XXX_CORE
-       bool
+       tristate
 
 config REGULATOR_MC13783
        tristate "Support regulators on Freescale MC13783 PMIC"
@@ -197,6 +197,14 @@ config REGULATOR_MC13783
          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