The patch titled
hdaps: remove duplicate whitelist entry and add ThinkPad R52 (1847W62)
has been added to the -mm tree. Its filename is
hdaps-remove-duplicate-whitelist-entry-and-add-thinkpad.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: hdaps: remove duplicate whitelist entry and add ThinkPad R52 (1847W62)
From: Stephan Berberig <s.berberig@xxxxxxxx>
Remove a duplicate whitelist entry for the "ThinkPad H" and adds the
"strange" DMI for the ThinkPad R52 (1847W62).
BTW, The strange DMIs for the ThinkPad R52 1846AQG and 1847W62 are fixed
in latest BIOS. See http://www.thinkwiki.org/wiki/List_of_DMI_IDs#R_series
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/hwmon/hdaps.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/hwmon/hdaps.c~hdaps-remove-duplicate-whitelist-entry-and-add-thinkpad drivers/hwmon/hdaps.c
--- a/drivers/hwmon/hdaps.c~hdaps-remove-duplicate-whitelist-entry-and-add-thinkpad
+++ a/drivers/hwmon/hdaps.c
@@ -524,12 +524,12 @@ static int __init hdaps_init(void)
/* Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match
"ThinkPad T42p", so the order of the entries matters */
struct dmi_system_id hdaps_whitelist[] = {
- HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),
HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"),
HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"),
HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"),
HDAPS_DMI_MATCH_NORMAL("ThinkPad R52"),
HDAPS_DMI_MATCH_NORMAL("ThinkPad H"), /* R52 (1846AQG) */
+ HDAPS_DMI_MATCH_NORMAL("ThinkPad ."), /* R52 (1847W62) */
HDAPS_DMI_MATCH_INVERT("ThinkPad T41p"),
HDAPS_DMI_MATCH_NORMAL("ThinkPad T41"),
HDAPS_DMI_MATCH_INVERT("ThinkPad T42p"),
_
Patches currently in -mm which might be from s.berberig@xxxxxxxx are
hdaps-remove-duplicate-whitelist-entry-and-add-thinkpad.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
