diff options
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 64ec644808bc..555d0337ad95 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 5 | #include <linux/cpu.h> | 5 | #include <linux/cpu.h> |
| 6 | #include <linux/cpuidle.h> | ||
| 7 | #include <linux/thermal.h> | 6 | #include <linux/thermal.h> |
| 8 | #include <asm/acpi.h> | 7 | #include <asm/acpi.h> |
| 9 | 8 | ||
| @@ -59,13 +58,11 @@ struct acpi_processor_cx { | |||
| 59 | u8 entry_method; | 58 | u8 entry_method; |
| 60 | u8 index; | 59 | u8 index; |
| 61 | u32 latency; | 60 | u32 latency; |
| 62 | u32 power; | ||
| 63 | u8 bm_sts_skip; | 61 | u8 bm_sts_skip; |
| 64 | char desc[ACPI_CX_DESC_LEN]; | 62 | char desc[ACPI_CX_DESC_LEN]; |
| 65 | }; | 63 | }; |
| 66 | 64 | ||
| 67 | struct acpi_processor_power { | 65 | struct acpi_processor_power { |
| 68 | struct cpuidle_device dev; | ||
| 69 | struct acpi_processor_cx *state; | 66 | struct acpi_processor_cx *state; |
| 70 | unsigned long bm_check_timestamp; | 67 | unsigned long bm_check_timestamp; |
| 71 | u32 default_state; | 68 | u32 default_state; |
| @@ -325,12 +322,10 @@ extern void acpi_processor_reevaluate_tstate(struct acpi_processor *pr, | |||
| 325 | extern const struct file_operations acpi_processor_throttling_fops; | 322 | extern const struct file_operations acpi_processor_throttling_fops; |
| 326 | extern void acpi_processor_throttling_init(void); | 323 | extern void acpi_processor_throttling_init(void); |
| 327 | /* in processor_idle.c */ | 324 | /* in processor_idle.c */ |
| 328 | int acpi_processor_power_init(struct acpi_processor *pr, | 325 | int acpi_processor_power_init(struct acpi_processor *pr); |
| 329 | struct acpi_device *device); | 326 | int acpi_processor_power_exit(struct acpi_processor *pr); |
| 330 | int acpi_processor_cst_has_changed(struct acpi_processor *pr); | 327 | int acpi_processor_cst_has_changed(struct acpi_processor *pr); |
| 331 | int acpi_processor_hotplug(struct acpi_processor *pr); | 328 | int acpi_processor_hotplug(struct acpi_processor *pr); |
| 332 | int acpi_processor_power_exit(struct acpi_processor *pr, | ||
| 333 | struct acpi_device *device); | ||
| 334 | int acpi_processor_suspend(struct device *dev); | 329 | int acpi_processor_suspend(struct device *dev); |
| 335 | int acpi_processor_resume(struct device *dev); | 330 | int acpi_processor_resume(struct device *dev); |
| 336 | extern struct cpuidle_driver acpi_idle_driver; | 331 | extern struct cpuidle_driver acpi_idle_driver; |
