From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754133AbcBOVDd (ORCPT ); Mon, 15 Feb 2016 16:03:33 -0500 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:52992 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754036AbcBOVD1 (ORCPT ); Mon, 15 Feb 2016 16:03:27 -0500 From: Mark Brown To: Liviu Dudau , Lorenzo Pieralisi , Liam Girdwood , Mark Brown , Rusty Russell , Sudeep Holla , Mark Brown Cc: linux-kernel@vger.kernel.org In-Reply-To: Message-Id: Date: Mon, 15 Feb 2016 21:03:15 +0000 X-SA-Exim-Connect-IP: 31.98.204.232 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Applied "regulator: vexpress: rename vexpress regulator implementation" to the regulator tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch regulator: vexpress: rename vexpress regulator implementation has been applied to the regulator tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >>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 980b194..755077a 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 -- 2.7.0