From 935514c961310558ee0767e73e678b85ac37a68d Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Fri, 29 Jan 2016 17:37:01 +0000 Subject: [PATCH] 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 Cc: Lorenzo Pieralisi Cc: Liam Girdwood Cc: Mark Brown Reported-by: Rusty Russell Signed-off-by: Sudeep Holla Signed-off-by: Mark Brown --- drivers/regulator/Makefile | 2 +- drivers/regulator/{vexpress.c => vexpress-regulator.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename drivers/regulator/{vexpress.c => vexpress-regulator.c} (100%) diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 980b1943fa81..755077a89a25 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 diff --git a/drivers/regulator/vexpress.c b/drivers/regulator/vexpress-regulator.c similarity index 100% rename from drivers/regulator/vexpress.c rename to drivers/regulator/vexpress-regulator.c