---

yaml --- r: 44534 b: refs/heads/master c: 0f23e50 h: refs/heads/master v: v3
git-mirror · Dec 12, 2006 · 221776d · 221776d
1 parent 6ef5265
commit 221776d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 509a5e85c3a8f0a81c916fac4579b6d1b5ea58da
+refs/heads/master: 0f23e50aa5fc578e1c50e873858e6ab7a1e32f0e
diff --git a/trunk/drivers/hwmon/Kconfig b/trunk/drivers/hwmon/Kconfig
@@ -527,6 +527,9 @@ config SENSORS_HDAPS
 	  This driver also provides an absolute input class device, allowing
 	  the laptop to act as a pinball machine-esque joystick.
 
+	  If your ThinkPad is not recognized by the driver, please update to latest
+	  BIOS. This is especially the case for some R52 ThinkPads.
+
 	  Say Y here if you have an applicable laptop and want to experience
 	  the awesome power of hdaps.
 

diff --git a/trunk/drivers/hwmon/hdaps.c b/trunk/drivers/hwmon/hdaps.c
@@ -511,14 +511,14 @@ static int __init hdaps_dmi_match_invert(struct dmi_system_id *id)
 }
 
 /* Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match
-  "ThinkPad T42p", so the order of the entries matters */
+   "ThinkPad T42p", so the order of the entries matters.
+   If your ThinkPad is not recognized, please update to latest
+   BIOS. This is especially the case for some R52 ThinkPads. */
 static struct dmi_system_id __initdata hdaps_whitelist[] = {
-	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad H"),
 	HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
-	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad H"),	   /* R52 (1846AQG) */
 	HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
 	HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
 	HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"),