diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-22 18:08:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-22 18:08:56 -0400 |
commit | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (patch) | |
tree | 2c82f5d26bd9f2e2f82711ef58f3c7a1b6a9a4df /drivers/hwmon/hdaps.c | |
parent | eaa8568901b3164197ce727c4c9b4067383e526c (diff) | |
parent | 4941b395b3c2635a8c16d88791a789fb6ac6be43 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (44 commits)
[PATCH] I2C: I2C controllers go into right place on sysfs
[PATCH] hwmon-vid: Add support for Intel Core and Conroe
[PATCH] lm70: New hardware monitoring driver
[PATCH] hwmon: Fix the Kconfig header
[PATCH] i2c-i801: Merge setup function
[PATCH] i2c-i801: Better pci subsystem integration
[PATCH] i2c-i801: Cleanups
[PATCH] i2c-i801: Remove PCI function check
[PATCH] i2c-i801: Remove force_addr parameter
[PATCH] i2c-i801: Fix block transaction poll loops
[PATCH] scx200_acb: Documentation update
[PATCH] scx200_acb: Mark scx200_acb_probe __init
[PATCH] scx200_acb: Use PCI I/O resource when appropriate
[PATCH] i2c: Mark block write buffers as const
[PATCH] i2c-ocores: Minor cleanups
[PATCH] abituguru: Fix fan detection
[PATCH] abituguru: Review fixes
[PATCH] abituguru: New hardware monitoring driver
[PATCH] w83792d: Add missing data access locks
[PATCH] w83792d: Fix setting the PWM value
...
Diffstat (limited to 'drivers/hwmon/hdaps.c')
-rw-r--r-- | drivers/hwmon/hdaps.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c index 1659f6c41458..42b632889dd8 100644 --- a/drivers/hwmon/hdaps.c +++ b/drivers/hwmon/hdaps.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #define HDAPS_PORT_STATE 0x1611 /* device state */ | 41 | #define HDAPS_PORT_STATE 0x1611 /* device state */ |
42 | #define HDAPS_PORT_YPOS 0x1612 /* y-axis position */ | 42 | #define HDAPS_PORT_YPOS 0x1612 /* y-axis position */ |
43 | #define HDAPS_PORT_XPOS 0x1614 /* x-axis position */ | 43 | #define HDAPS_PORT_XPOS 0x1614 /* x-axis position */ |
44 | #define HDAPS_PORT_TEMP1 0x1616 /* device temperature, in celcius */ | 44 | #define HDAPS_PORT_TEMP1 0x1616 /* device temperature, in Celsius */ |
45 | #define HDAPS_PORT_YVAR 0x1617 /* y-axis variance (what is this?) */ | 45 | #define HDAPS_PORT_YVAR 0x1617 /* y-axis variance (what is this?) */ |
46 | #define HDAPS_PORT_XVAR 0x1619 /* x-axis variance (what is this?) */ | 46 | #define HDAPS_PORT_XVAR 0x1619 /* x-axis variance (what is this?) */ |
47 | #define HDAPS_PORT_TEMP2 0x161b /* device temperature (again?) */ | 47 | #define HDAPS_PORT_TEMP2 0x161b /* device temperature (again?) */ |
@@ -522,13 +522,15 @@ static int __init hdaps_init(void) | |||
522 | { | 522 | { |
523 | int ret; | 523 | int ret; |
524 | 524 | ||
525 | /* Note that DMI_MATCH(...,"ThinkPad T42") will match "ThinkPad T42p" */ | 525 | /* Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match |
526 | "ThinkPad T42p", so the order of the entries matters */ | ||
526 | struct dmi_system_id hdaps_whitelist[] = { | 527 | struct dmi_system_id hdaps_whitelist[] = { |
527 | HDAPS_DMI_MATCH_NORMAL("ThinkPad H"), | 528 | HDAPS_DMI_MATCH_NORMAL("ThinkPad H"), |
528 | HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"), | 529 | HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"), |
529 | HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"), | 530 | HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"), |
530 | HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"), | 531 | HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"), |
531 | HDAPS_DMI_MATCH_NORMAL("ThinkPad R52"), | 532 | HDAPS_DMI_MATCH_NORMAL("ThinkPad R52"), |
533 | HDAPS_DMI_MATCH_NORMAL("ThinkPad H"), /* R52 (1846AQG) */ | ||
532 | HDAPS_DMI_MATCH_INVERT("ThinkPad T41p"), | 534 | HDAPS_DMI_MATCH_INVERT("ThinkPad T41p"), |
533 | HDAPS_DMI_MATCH_NORMAL("ThinkPad T41"), | 535 | HDAPS_DMI_MATCH_NORMAL("ThinkPad T41"), |
534 | HDAPS_DMI_MATCH_INVERT("ThinkPad T42p"), | 536 | HDAPS_DMI_MATCH_INVERT("ThinkPad T42p"), |
@@ -536,9 +538,9 @@ static int __init hdaps_init(void) | |||
536 | HDAPS_DMI_MATCH_NORMAL("ThinkPad T43"), | 538 | HDAPS_DMI_MATCH_NORMAL("ThinkPad T43"), |
537 | HDAPS_DMI_MATCH_LENOVO("ThinkPad T60p"), | 539 | HDAPS_DMI_MATCH_LENOVO("ThinkPad T60p"), |
538 | HDAPS_DMI_MATCH_NORMAL("ThinkPad X40"), | 540 | HDAPS_DMI_MATCH_NORMAL("ThinkPad X40"), |
539 | HDAPS_DMI_MATCH_NORMAL("ThinkPad X41 Tablet"), | ||
540 | HDAPS_DMI_MATCH_NORMAL("ThinkPad X41"), | 541 | HDAPS_DMI_MATCH_NORMAL("ThinkPad X41"), |
541 | HDAPS_DMI_MATCH_LENOVO("ThinkPad X60"), | 542 | HDAPS_DMI_MATCH_LENOVO("ThinkPad X60"), |
543 | HDAPS_DMI_MATCH_NORMAL("ThinkPad Z60m"), | ||
542 | { .ident = NULL } | 544 | { .ident = NULL } |
543 | }; | 545 | }; |
544 | 546 | ||