diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 17:28:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 17:28:07 -0700 |
| commit | 27afe58fe60fbf71a25f1f592472c0e7b72b3502 (patch) | |
| tree | d1d7768dbd1bcf01b5eea38c6fb55fe25b16f5cd /drivers/acpi | |
| parent | 7eb901e79129d457b72b3876a948a28c34557285 (diff) | |
| parent | c25d29952b2a8c9aaf00e081c9162a0e383030cd (diff) | |
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
intel_idle: do not use the LAPIC timer for ATOM C2
intel_idle: add initial Sandy Bridge support
acpi_idle: delete bogus data from cpuidle_state.power_usage
intel_idle: delete bogus data from cpuidle_state.power_usage
intel_idle: simplify test for leave_mm()
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index f4428e82b35..07a8bb6506f 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -1013,7 +1013,6 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) strncpy(state->desc, cx->desc, CPUIDLE_DESC_LEN); state->exit_latency = cx->latency; state->target_residency = cx->latency * latency_factor; - state->power_usage = cx->power; state->flags = 0; switch (cx->type) { |