Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 217094
b: refs/heads/master
c: e0a8755
h: refs/heads/master
v: v3
  • Loading branch information
Jan Beulich authored and Guenter Roeck committed Oct 25, 2010
1 parent 0c35e0c commit c8a829a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a5f42a6bc51454137b918f67310168c27d1dd1de
refs/heads/master: e0a8755b6b701b3397c4c23ff182b7eb6ac6fe26
2 changes: 0 additions & 2 deletions trunk/drivers/hwmon/coretemp.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,9 @@ static int __devinit get_tjmax(struct cpuinfo_x86 *c, u32 id,
case 0x1a:
dev_warn(dev, "TjMax is assumed as 100 C!\n");
return 100000;
break;
case 0x17:
case 0x1c: /* Atom CPUs */
return adjust_tjmax(c, id, dev);
break;
default:
dev_warn(dev, "CPU (model=0x%x) is not supported yet,"
" using default TjMax of 100C.\n", c->x86_model);
Expand Down

0 comments on commit c8a829a

Please sign in to comment.