From: Mark Brown <broonie@linaro.org>
Date: Sun, 1 Sep 2013 12:50:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/kconfig' into regulator-next
X-Git-Tag: v3.12-rc1~191^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=099c60622417c25b5454061a54cedf5b5132650d;p=platform%2Fkernel%2Flinux-exynos.git

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

099c60622417c25b5454061a54cedf5b5132650d
diff --cc drivers/regulator/Kconfig
index 4a5367e,37f697d..6845d74
--- a/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.