diff options
| author | Rafael J. Wysocki | 2012-09-24 13:30:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2012-09-24 13:30:44 +0200 |
| commit | 721b50ee48ab65cea30c940951145afc11f3e362 (patch) | |
| tree | a450a4d52f439512f76122d3f2756dc1cdac7757 /include | |
| parent | Merge branch 'pm-cpufreq' (diff) | |
| parent | cpuidle: rename function name "__cpuidle_register_driver", v2 (diff) | |
| download | kernel-qcow2-linux-721b50ee48ab65cea30c940951145afc11f3e362.tar.gz kernel-qcow2-linux-721b50ee48ab65cea30c940951145afc11f3e362.tar.xz kernel-qcow2-linux-721b50ee48ab65cea30c940951145afc11f3e362.zip | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: rename function name "__cpuidle_register_driver", v2
cpuidle: remove some empty lines
cpuidle / ACPI : move cpuidle_device field out of the acpi_processor_power structure
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/processor.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 1d3c1a68acce..555d0337ad95 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -3,7 +3,6 @@ #include <linux/kernel.h> #include <linux/cpu.h> -#include <linux/cpuidle.h> #include <linux/thermal.h> #include <asm/acpi.h> @@ -64,7 +63,6 @@ struct acpi_processor_cx { }; struct acpi_processor_power { - struct cpuidle_device dev; struct acpi_processor_cx *state; unsigned long bm_check_timestamp; u32 default_state; |