diff options
| author | Colin Cross <ccross@android.com> | 2010-12-21 18:34:37 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-12-21 18:34:37 -0800 |
| commit | b104a07edb2a319f734ddc4fe04852865d8d9e24 (patch) | |
| tree | a0cd50b3d84ece4d94e366fac4b440e380c2d247 /drivers/idle/intel_idle.c | |
| parent | e87ec4d59e1f96381547e614c5279bed63775719 (diff) | |
| parent | a1346c99fc89f2b3d35c7d7e2e4aef8ea4124342 (diff) | |
Merge commit 'v2.6.36.2' into linux-tegra-2.6.36
Diffstat (limited to 'drivers/idle/intel_idle.c')
| -rw-r--r-- | drivers/idle/intel_idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index c37ef64d1465..cf88588a8e80 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -276,7 +276,7 @@ static int intel_idle_probe(void) case 0x1C: /* 28 - Atom Processor */ case 0x26: /* 38 - Lincroft Atom Processor */ - lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */ + lapic_timer_reliable_states = (1 << 1); /* C1 */ cpuidle_state_table = atom_cstates; break; #ifdef FUTURE_USE |