summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/Makefile
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@arm.com>2016-01-29 17:37:01 +0000
committerMark Brown <broonie@kernel.org>2016-02-15 21:01:52 +0000
commit935514c961310558ee0767e73e678b85ac37a68d (patch)
tree8b9b052647a4c1084eba58427561acb67caf3c5a /drivers/regulator/Makefile
parent92e963f50fc74041b5e9e744c330dca48e04f08d (diff)
downloadlinux-0-day-935514c961310558ee0767e73e678b85ac37a68d.tar.gz
linux-0-day-935514c961310558ee0767e73e678b85ac37a68d.tar.xz
regulator: vexpress: rename vexpress regulator implementation
The vexpress regulator implementation is currently just called vexpress. This is a problem because it clashes with another module with the same name in hardware monitors. This patch renames the vexpress regulator implementation to vexpress-regulator so that there will be no clash in the module namespace. Cc: Liviu Dudau <liviu.dudau@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Reported-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/Makefile')
-rw-r--r--drivers/regulator/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 980b1943fa815..755077a89a254 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -98,7 +98,7 @@ 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_VEXPRESS) += vexpress-regulator.o
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o