From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 24 Mar 2012 11:29:58 +0000 (+0000)
Subject: Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: upstream/snapshot3+hdmi~7863^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=511f1cb6d426938fabf9c6d69ce4861b66ffd919;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'regulator-3.4' of git://git./linux/kernel/git/broonie/regulator into next/drivers

The pxa regulator branch removes the bq24022 driver, while a lot of
other regulator drivers got added in the regulator tree. This
resolves the trivial conflicts by merging in the regulator patches
that are already merged into v3.4.

Conflicts:
	drivers/regulator/Kconfig
	drivers/regulator/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

511f1cb6d426938fabf9c6d69ce4861b66ffd919
diff --cc drivers/regulator/Kconfig
index 740f468,a229de9..36db5a4
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -233,6 -240,32 +240,24 @@@ config REGULATOR_AB310
  	 AB3100 analog baseband dealing with power regulators
  	 for the system.
  
+ 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_DBX500_PRCMU
+ 	bool
+ 
+ config REGULATOR_DB8500_PRCMU
+ 	bool "ST-Ericsson DB8500 Voltage Domain Regulators"
+ 	depends on MFD_DB8500_PRCMU
+ 	select REGULATOR_DBX500_PRCMU
+ 	help
+ 	  This driver supports the voltage domain regulators controlled by the
+ 	  DB8500 PRCMU
+ 
 -config REGULATOR_BQ24022
 -	tristate "TI bq24022 Dual Input 1-Cell Li-Ion Charger IC"
 -	help
 -	  This driver controls a TI bq24022 Charger attached via
 -	  GPIOs. The provided current regulator can enable/disable
 -	  charging select between 100 mA and 500 mA charging current
 -	  limit.
 -
  config REGULATOR_TPS6105X
  	tristate "TI TPS6105X Power regulators"
  	depends on TPS6105X
diff --cc drivers/regulator/Makefile
index f53cf80,b5042c8..94b5274
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -10,7 -10,18 +10,17 @@@ obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER
  obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o
  
  obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o
+ obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
+ obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o
+ obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
+ obj-$(CONFIG_REGULATOR_AB8500)	+= ab8500.o
  obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
+ obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
 -obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
+ obj-$(CONFIG_REGULATOR_DA903X)	+= da903x.o
+ obj-$(CONFIG_REGULATOR_DA9052)	+= da9052-regulator.o
+ obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o
+ obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o
+ obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o
  obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
  obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o
  obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o