Merge remote-tracking branch 'regulator/topic/kconfig' into regulator-next

diff --combined drivers/regulator/Kconfig
index 4a5367e3b6c3cf4ad8d4283742712f5c19cebc07,37f697dc4b4c2ed0316f9410051e28a6934f6665..6845d7439c2322c31e037e8972c7a866e29bbce4
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -64,18 -64,8 +64,18 @@@ config REGULATOR_USERSPACE_CONSUME
  
          If unsure, say no.
  
 +config REGULATOR_88PM800
 +      tristate "Marvell 88PM800 Power regulators"
 +      depends on MFD_88PM800
 +      help
 +        This driver supports Marvell 88PM800 voltage regulator chips.
 +        It delivers digitally programmable output,
 +        the voltage is programmed via I2C interface.
 +        It's suitable to support PXA988 chips to control VCC_MAIN and
 +        various voltages.
 +
  config REGULATOR_88PM8607
-       bool "Marvell 88PM8607 Power regulators"
+       tristate "Marvell 88PM8607 Power regulators"
        depends on MFD_88PM860X=y
        help
          This driver supports 88PM8607 voltage regulator chips.
@@@ -157,26 -147,6 +157,26 @@@ config REGULATOR_DA905
          This driver can also be built as a module. If so, the module
          will be called da9055-regulator.
  
 +config REGULATOR_DA9063
 +      tristate "Dialog Semiconductor DA9063 regulators"
 +      depends on MFD_DA9063
 +      help
 +        Say y here to support the BUCKs and LDOs regulators found on
 +        DA9063 PMICs.
 +
 +        This driver can also be built as a module. If so, the module
 +        will be called da9063-regulator.
 +
 +config REGULATOR_DA9210
 +      tristate "Dialog Semiconductor DA9210 regulator"
 +      depends on I2C
 +      select REGMAP_I2C
 +      help
 +        Say y here to support for the Dialog Semiconductor DA9210.
 +        The DA9210 is a multi-phase synchronous step down
 +        converter 12A DC-DC Buck controlled through an I2C
 +        interface.
 +
  config REGULATOR_DBX500_PRCMU
        bool
  
@@@ -230,8 -200,8 +230,8 @@@ config REGULATOR_LP397
         on National Semiconductors LP3972 PMIC
  
  config REGULATOR_LP872X
-       bool "TI/National Semiconductor LP8720/LP8725 voltage regulators"
-       depends on I2C=y
+       tristate "TI/National Semiconductor LP8720/LP8725 voltage regulators"
+       depends on I2C
        select REGMAP_I2C
        help
          This driver supports LP8720/LP8725 PMIC
@@@ -246,7 -216,7 +246,7 @@@ config REGULATOR_LP875
          9 mode multiphase configuration.
  
  config REGULATOR_LP8788
-       bool "TI LP8788 Power Regulators"
+       tristate "TI LP8788 Power Regulators"
        depends on MFD_LP8788
        help
          This driver supports LP8788 voltage regulator chip.
@@@ -412,7 -382,7 +412,7 @@@ config REGULATOR_S5M876
         supports DVS mode with 8bits of output voltage control.
  
  config REGULATOR_TI_ABB
-       bool "TI Adaptive Body Bias on-chip LDO"
+       tristate "TI Adaptive Body Bias on-chip LDO"
        depends on ARCH_OMAP
        help
          Select this option to support Texas Instruments' on-chip Adaptive Body
@@@ -522,7 -492,7 +522,7 @@@ config REGULATOR_TPS8003
          output to control regulators.
  
  config REGULATOR_TWL4030
-       bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 PMIC"
+       tristate "TI TWL4030/TWL5030/TWL6030/TPS659x0 PMIC"
        depends on TWL4030_CORE
        help
          This driver supports the voltage regulators provided by