From c8a829aa9239f6a70de5c14f494307547304342b Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Mon, 13 Sep 2010 10:28:35 +0000
Subject: [PATCH] --- yaml --- r: 217094 b: refs/heads/master c:
 e0a8755b6b701b3397c4c23ff182b7eb6ac6fe26 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/hwmon/coretemp.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c75e87e24230..dd0942227f0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5f42a6bc51454137b918f67310168c27d1dd1de
+refs/heads/master: e0a8755b6b701b3397c4c23ff182b7eb6ac6fe26
diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c
index f34fe836b5c9..b7084b383703 100644
--- a/trunk/drivers/hwmon/coretemp.c
+++ b/trunk/drivers/hwmon/coretemp.c
@@ -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);