Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...

[net-next-2.6.git] / drivers / hwmon / k8temp.c

diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index f26acdb116819896c4e1e6bcb22eed2f364982ae..8bdf80d915985ff77ae31b197aab2f7fb08acb68 100644 (file)
--- 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;
                }