From: Mark Brown <broonie@kernel.org>
Date: Tue, 12 Jan 2016 18:26:10 +0000 (+0000)
Subject: Merge remote-tracking branches 'regulator/topic/pv88090', 'regulator/topic/qcom-smd... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=78ae90255276d2cb9e4410df74b378cb9f8a8bbb;p=linux.git

Merge remote-tracking branches 'regulator/topic/pv88090', 'regulator/topic/qcom-smd', 'regulator/topic/tps6105x', 'regulator/topic/tps65086' and 'regulator/topic/tps65218' into regulator-next
---

78ae90255276d2cb9e4410df74b378cb9f8a8bbb
diff --cc drivers/regulator/Kconfig
index bfa4944ed1235,5433c448aff24,8df0b0e62976d,8df0b0e62976d,b45fc6023bef1,8df0b0e62976d..3904dc040695e
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@@@@@ -514,14 -504,22 -504,6 -504,6 -504,6 -504,6 +514,22 @@@@@@@ config REGULATOR_PFUZE10
      	  Say y here to support the regulators found on the Freescale
      	  PFUZE100/PFUZE200 PMIC.
      
  ++++config REGULATOR_PV88060
  ++++	tristate "Powerventure Semiconductor PV88060 regulator"
  ++++	depends on I2C
  ++++	select REGMAP_I2C
  ++++	help
  ++++	  Say y here to support the voltage regulators and convertors
  ++++	  PV88060
  ++++
+ ++++config REGULATOR_PV88090
+ ++++	tristate "Powerventure Semiconductor PV88090 regulator"
+ ++++	depends on I2C
+ ++++	select REGMAP_I2C
+ ++++	help
+ ++++	  Say y here to support the voltage regulators and convertors
+ ++++	  on PV88090
+ ++++
      config REGULATOR_PWM
      	tristate "PWM voltage regulator"
      	depends on PWM
diff --cc drivers/regulator/Makefile
index 3f6a6a6a9f1ac,29cda9d537877,0f8174913c17b,0f8174913c17b,945d8ec5ea8ff,0f8174913c17b..980b1943fa815
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@@@ -67,7 -66,8 -66,6 -66,6 -66,6 -66,6 +67,8 @@@@@@@ obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) +
      obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qcom_spmi-regulator.o
      obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
      obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
  ++++obj-$(CONFIG_REGULATOR_PV88060) += pv88060-regulator.o
+ ++++obj-$(CONFIG_REGULATOR_PV88090) += pv88090-regulator.o
      obj-$(CONFIG_REGULATOR_PWM) += pwm-regulator.o
      obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
      obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o