From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932614AbcA2RgI (ORCPT ); Fri, 29 Jan 2016 12:36:08 -0500 Received: from foss.arm.com ([217.140.101.70]:40319 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756574AbcA2RgH (ORCPT ); Fri, 29 Jan 2016 12:36:07 -0500 From: Sudeep Holla To: linux-kernel@vger.kernel.org, Guenter Roeck Cc: Sudeep Holla , Rusty Russell , Liviu Dudau , Lorenzo Pieralisi , Jean Delvare , lm-sensors@lm-sensors.org Subject: [PATCH] hwmon: (vexpress) rename vexpress hwmon implementation Date: Fri, 29 Jan 2016 17:35:52 +0000 Message-Id: <1454088952-24722-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The vexpress hwmon implementation is currently just called vexpress. This is a problem because it clashes with another module with the same name in regulators. This patch renames the vexpress hwmon implementation to vexpress-hwmon so that there will be no clash in the module namespace. Cc: Liviu Dudau Cc: Lorenzo Pieralisi Cc: Jean Delvare Cc: Guenter Roeck Cc: lm-sensors@lm-sensors.org Reported-by: Rusty Russell Signed-off-by: Sudeep Holla --- drivers/hwmon/Makefile | 2 +- drivers/hwmon/{vexpress.c => vexpress-hwmon.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename drivers/hwmon/{vexpress.c => vexpress-hwmon.c} (100%) diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 30c94df31465..cfc09711810c 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -149,7 +149,7 @@ obj-$(CONFIG_SENSORS_TMP103) += tmp103.o obj-$(CONFIG_SENSORS_TMP401) += tmp401.o obj-$(CONFIG_SENSORS_TMP421) += tmp421.o obj-$(CONFIG_SENSORS_TWL4030_MADC)+= twl4030-madc-hwmon.o -obj-$(CONFIG_SENSORS_VEXPRESS) += vexpress.o +obj-$(CONFIG_SENSORS_VEXPRESS) += vexpress-hwmon.o obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o obj-$(CONFIG_SENSORS_VIA686A) += via686a.o obj-$(CONFIG_SENSORS_VT1211) += vt1211.o diff --git a/drivers/hwmon/vexpress.c b/drivers/hwmon/vexpress-hwmon.c similarity index 100% rename from drivers/hwmon/vexpress.c rename to drivers/hwmon/vexpress-hwmon.c -- 1.9.1