From patchwork Fri Jan 29 17:35:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 60813 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1255435lbb; Fri, 29 Jan 2016 09:36:11 -0800 (PST) X-Received: by 10.98.67.14 with SMTP id q14mr15209480pfa.137.1454088971311; Fri, 29 Jan 2016 09:36:11 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 5si20861797pfs.118.2016.01.29.09.36.11; Fri, 29 Jan 2016 09:36:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932633AbcA2RgI (ORCPT + 30 others); 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 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6AE0449; Fri, 29 Jan 2016 09:35:24 -0800 (PST) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.207.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5E7683F2E5; Fri, 29 Jan 2016 09:36:05 -0800 (PST) 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 Precedence: bulk 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%) -- 1.9.1 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