diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-07-14 15:15:07 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-07-14 15:15:07 +0200 |
commit | d5585d6d3e2db78dbca48b2b9537dd9abd8b4cae (patch) | |
tree | 413e7ba7d023b674be23b8bf5284ecd3d24232b1 /drivers/hwmon/k8temp.c | |
parent | 7d442d2c13f0bd263f516733c50126ce6f1e85c7 (diff) | |
parent | 1c5474a65bf15a4cb162dfff86d6d0b5a08a740c (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/hwmon/k8temp.c')
-rw-r--r-- | drivers/hwmon/k8temp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c index f26acdb11681..8bdf80d91598 100644 --- a/drivers/hwmon/k8temp.c +++ b/drivers/hwmon/k8temp.c @@ -180,11 +180,13 @@ static int __devinit k8temp_probe(struct pci_dev *pdev, } if ((model >= 0x69) && - !(model == 0xc1 || model == 0x6c || model == 0x7c)) { + !(model == 0xc1 || model == 0x6c || model == 0x7c || + model == 0x6b || model == 0x6f || model == 0x7f)) { /* - * RevG desktop CPUs (i.e. no socket S1G1 parts) - * need additional offset, otherwise reported - * temperature is below ambient temperature + * RevG desktop CPUs (i.e. no socket S1G1 or + * ASB1 parts) need additional offset, + * otherwise reported temperature is below + * ambient temperature */ data->temp_offset = 21000; } |