diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-09 23:31:04 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-09 23:31:04 -0500 |
| commit | 81e16e554f20a53128ad9879600f28618581f318 (patch) | |
| tree | 1dd7dd4ed165879d23ac673383f0a92e2708eccf | |
| parent | 162ece4b96277815ba4816c7b78130becf0a7b89 (diff) | |
| download | rt-patches-81e16e554f20a53128ad9879600f28618581f318.tar.gz | |
refresh drivers-hwmon-coretemp.c-detect-the-thermal-sensors-.patchv2.6.34-rc2-409-g246750fv2.6.34-rc2-407-g4660d3dv2.6.34-rc2-394-gbe3fd3cv2.6.34-rc2-390-g9623e5av2.6.34-rc2-378-g9f32160v2.6.34-rc2-349-g9d54e2c
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | drivers-hwmon-coretemp.c-detect-the-thermal-sensors-.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers-hwmon-coretemp.c-detect-the-thermal-sensors-.patch b/drivers-hwmon-coretemp.c-detect-the-thermal-sensors-.patch index 7a50220..7bcc3d1 100644 --- a/drivers-hwmon-coretemp.c-detect-the-thermal-sensors-.patch +++ b/drivers-hwmon-coretemp.c-detect-the-thermal-sensors-.patch @@ -1,4 +1,4 @@ -From 4e31d9b5a6bb9d3618e1b44385b472d6c0c8597d Mon Sep 17 00:00:00 2001 +From 34a32c59664593ed751778512e891126058b40c0 Mon Sep 17 00:00:00 2001 From: Carsten Emde <C.Emde@osadl.org> Date: Mon, 24 May 2010 14:33:39 -0700 Subject: [PATCH] drivers/hwmon/coretemp.c: detect the thermal sensors by CPUID @@ -21,7 +21,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c -index 2d7bcee..915dff5 100644 +index e9b7fbc..6f7cbc0 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -451,28 +451,20 @@ static int __init coretemp_init(void) @@ -52,11 +52,11 @@ index 2d7bcee..915dff5 100644 - family 6 CPU */ - if ((c->x86 == 0x6) && (c->x86_model > 0xf)) - printk(KERN_WARNING DRVNAME ": Unknown CPU " -- "model %x\n", c->x86_model); +- "model 0x%x\n", c->x86_model); - continue; + } else { + printk(KERN_INFO DRVNAME ": CPU (model=0x%x)" -+ " has no thermal sensor.\n", c->x86_model); ++ " 0xhas no thermal sensor.\n", c->x86_model); } - - err = coretemp_device_add(i); |