diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /drivers/idle | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'drivers/idle')
| -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) | |||
| 276 | 276 | ||
| 277 | case 0x1C: /* 28 - Atom Processor */ | 277 | case 0x1C: /* 28 - Atom Processor */ |
| 278 | case 0x26: /* 38 - Lincroft Atom Processor */ | 278 | case 0x26: /* 38 - Lincroft Atom Processor */ |
| 279 | lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */ | 279 | lapic_timer_reliable_states = (1 << 1); /* C1 */ |
| 280 | cpuidle_state_table = atom_cstates; | 280 | cpuidle_state_table = atom_cstates; |
| 281 | break; | 281 | break; |
| 282 | #ifdef FUTURE_USE | 282 | #ifdef FUTURE_USE |