author: Ben Hutchings <ben@decadent.org.uk> 2012-02-16 04:13:14 +0000
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2012-02-15 22:27:15 -0800
commit: 8bf11938459ff8ceb8643258d0a35e0f2bc9be17
parent: 9f3519d2ed26d2ede5b6432fb64af0e7e8ed13e3
Commit Summary:
Diffstat:
1 file changed, 4 insertions, 7 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index a238649e7461..1c15e9b33575 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -331,10 +331,6 @@ static void auto_demotion_disable(void *dummy)
static const struct idle_cpu idle_cpu_nehalem = {
.state_table = nehalem_cstates,
-};
-
-static const struct idle_cpu idle_cpu_westmere = {
- .state_table = nehalem_cstates,
.auto_demotion_disable_flags = NHM_C1_AUTO_DEMOTE | NHM_C3_AUTO_DEMOTE,
};
@@ -358,12 +354,12 @@ static const struct x86_cpu_id intel_idle_ids[] = {
ICPU(0x1a, idle_cpu_nehalem),
ICPU(0x1e, idle_cpu_nehalem),
ICPU(0x1f, idle_cpu_nehalem),
- ICPU(0x25, idle_cpu_westmere),
- ICPU(0x2c, idle_cpu_westmere),
- ICPU(0x2e, idle_cpu_westmere),
+ ICPU(0x25, idle_cpu_nehalem),
+ ICPU(0x2c, idle_cpu_nehalem),
+ ICPU(0x2e, idle_cpu_nehalem),
ICPU(0x1c, idle_cpu_atom),
ICPU(0x26, idle_cpu_lincroft),
- ICPU(0x2f, idle_cpu_westmere),
+ ICPU(0x2f, idle_cpu_nehalem),
ICPU(0x2a, idle_cpu_snb),
ICPU(0x2d, idle_cpu_snb),
{}