From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 10 Dec 2012 03:42:53 +0000 (+0900)
Subject: Merge remote-tracking branch 'regulator/topic/da9055' into regulator-next
X-Git-Tag: Ubuntu-5.10.0-12.13~20099^2~22
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=db58e0270ce36fbcee22147405e1917ce01880ae;p=mirror_ubuntu-hirsute-kernel.git

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

db58e0270ce36fbcee22147405e1917ce01880ae
diff --cc drivers/regulator/Makefile
index c1557ace9095,4b754e958aed..993151d6fdf9
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -16,9 -16,9 +16,10 @@@ obj-$(CONFIG_REGULATOR_AB8500)	+= ab850
  obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
  obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
  obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
 +obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o
  obj-$(CONFIG_REGULATOR_DA903X)	+= da903x.o
  obj-$(CONFIG_REGULATOR_DA9052)	+= da9052-regulator.o
+ obj-$(CONFIG_REGULATOR_DA9055)	+= da9055-regulator.o
  obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o
  obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o
  obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o