From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 20 Nov 2012 01:30:22 +0000 (+0900)
Subject: Merge branches 'topic/tps51632', 'topic/tps80031', 'topic/vexpress', 'topic/max8925... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f86221d2b9ce943753bbc2d2f79d12e9af1c4790;p=linux.git

Merge branches 'topic/tps51632', 'topic/tps80031', 'topic/vexpress', 'topic/max8925', 'topic/gpio' and 'topic/tps65090' of git://git./linux/kernel/git/broonie/regulator into regulator-hotplug
---

f86221d2b9ce943753bbc2d2f79d12e9af1c4790
diff --cc drivers/regulator/Makefile
index e431eed8a8782,ec1aec460bf6f,e5882668618f1,9fa7a7bc42d88,e431eed8a8782,e431eed8a8782,e431eed8a8782..6166d122d1252
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@@@@ -56,7 -57,7 -56,8 -56,8 -56,7 -56,7 -56,7 +57,9 @@@@@@@@ obj-$(CONFIG_REGULATOR_TPS6524X) += tps
       obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
       obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
       obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
++ ++++obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
       obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
+++ +++obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress.o
       obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
       obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
       obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o