summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier@osg.samsung.com>2017-01-02 16:20:55 +0100
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>2017-02-03 13:04:53 +0100
commit275721585b34e0104ccdeee21ffe4668da9b5fd3 (patch)
tree5879988c7a6ee9704faa955f0c510fbd9835fcc8 /drivers/platform
parentplatform/x86: mlx-platform: mlxcpld-hotplug driver style fixes (diff)
downloadlinux-275721585b34e0104ccdeee21ffe4668da9b5fd3.tar.xz
linux-275721585b34e0104ccdeee21ffe4668da9b5fd3.zip
platform/x86: intel_mid_thermal: Remove duplicated platform device ID
Commit 3fca3d3d5075 ("platform-x86: intel_mid_thermal: add msic_thermal alias") added a "msic_thermal" entry to the driver's platform device ID table since that was the platform dev name registered in some platforms and the only dev in the platform table was "msic_sensor" (DRIVER_NAME). But then commit 634830704d80 ("x86/mid/thermal: Add msic_thermal alias") changed DRIVER_NAME from "msic_sensor" to "msic_thermal", and so there's now duplicated entries in the platform device ID table. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/intel_mid_thermal.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c
index 0df3c9d37509..05ac7203806d 100644
--- a/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
@@ -549,7 +549,6 @@ static int mid_thermal_remove(struct platform_device *pdev)
static const struct platform_device_id therm_id_table[] = {
{ DRIVER_NAME, 1 },
- { "msic_thermal", 1 },
{ }
};