summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2012-02-11 22:57:38 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-13 15:24:27 -0800
commite668505c9811411c6096888b43ba104f35c9e9c3 (patch)
tree0d0eff2ce645fe27a77c0cbb20a0107e68d70629
parent5467bdda4a326513c2f14b712a22d59115b7ae94 (diff)
downloadlinux-3.10-e668505c9811411c6096888b43ba104f35c9e9c3.tar.gz
linux-3.10-e668505c9811411c6096888b43ba104f35c9e9c3.tar.bz2
linux-3.10-e668505c9811411c6096888b43ba104f35c9e9c3.zip
intel_idle: Fix ID for Nehalem-EX Xeon in device ID table
Commit b66b8b9a4a79087dde1b358a016e5c8739ccf186 ('intel-idle: convert to x86_cpu_id auto probing') put two entries for model 0x2f (Westmere-EX Xeon) in the device ID table and left out model 0x2e (Nehalem-EX Xeon). Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Acked-by: Thomas Renninger <trenn@suse.de> Acked-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/idle/intel_idle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 237fe5785f0..a238649e746 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -360,7 +360,7 @@ static const struct x86_cpu_id intel_idle_ids[] = {
ICPU(0x1f, idle_cpu_nehalem),
ICPU(0x25, idle_cpu_westmere),
ICPU(0x2c, idle_cpu_westmere),
- ICPU(0x2f, idle_cpu_westmere),
+ ICPU(0x2e, idle_cpu_westmere),
ICPU(0x1c, idle_cpu_atom),
ICPU(0x26, idle_cpu_lincroft),
ICPU(0x2f, idle_cpu_westmere),