Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

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

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 671b81a..172951b 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -102,8 +102,7 @@ config REGULATOR_MAX8925
 
 config REGULATOR_MAX8998
        tristate "Maxim 8998 voltage regulator"
-       depends on I2C
-       default n
+       depends on MFD_MAX8998
        help
          This driver controls a Maxim 8998 voltage output regulator
          via I2C bus. The provided regulator is suitable for S3C6410
@@ -222,5 +221,19 @@ config REGULATOR_AD5398
        help
          This driver supports AD5398 and AD5821 current regulator chips.
          If building into module, its name is ad5398.ko.
+
+config REGULATOR_AB8500
+       bool "ST-Ericsson AB8500 Power Regulators"
+       depends on AB8500_CORE
+       help
+         This driver supports the regulators found on the ST-Ericsson mixed
+         signal AB8500 PMIC
+
+config REGULATOR_TPS6586X
+       tristate "TI TPS6586X Power regulators"
+       depends on MFD_TPS6586X
+       help
+         This driver supports TPS6586X voltage regulator chips.
+
 endif