]> git.karo-electronics.de Git - linux-beck.git/commitdiff
hwmon: (vexpress) rename vexpress hwmon implementation
authorSudeep Holla <sudeep.holla@arm.com>
Fri, 29 Jan 2016 17:35:52 +0000 (17:35 +0000)
committerGuenter Roeck <linux@roeck-us.net>
Sat, 5 Mar 2016 14:25:33 +0000 (06:25 -0800)
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 <liviu.dudau@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: lm-sensors@lm-sensors.org
Reported-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/Makefile
drivers/hwmon/vexpress-hwmon.c [moved from drivers/hwmon/vexpress.c with 100% similarity]

index 30c94df314658fc8f9dcb04c7ae05eb141c979e1..cfc09711810c7877246d771485d714dfa401c337 100644 (file)
@@ -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