From: Mark Brown <broonie@linaro.org>
Date: Tue, 5 Aug 2014 17:29:27 +0000 (+0100)
Subject: Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s2mpu02... 
X-Git-Tag: v4.9.8~5966^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f71f26274d4c1c0898a057cf706bb1192fc63021;p=platform%2Fkernel%2Flinux-rpi3.git

Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s2mpu02', 'regulator/topic/s5m8767' and 'regulator/topic/tps65090' into regulator-next
---

f71f26274d4c1c0898a057cf706bb1192fc63021
diff --cc drivers/regulator/Kconfig
index f5040fc,203c02d,789eb46,789eb46,789eb46..2dc8289
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@@@@ -196,18 -196,8 -196,8 -196,8 -196,8 +196,18 @@@@@@ config REGULATOR_DA921
     	  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_DA9211
 ++++	tristate "Dialog Semiconductor DA9211/DA9212 regulator"
 ++++	depends on I2C
 ++++	select REGMAP_I2C
 ++++	help
 ++++	  Say y here to support for the Dialog Semiconductor DA9211/DA9212.
 ++++	  The DA9211/DA9212 is a multi-phase synchronous step down
 ++++	  converter 12A DC-DC Buck controlled through an I2C
  +++	  interface.
  +++
     config REGULATOR_DBX500_PRCMU
     	bool