diff options
| author | Len Brown <len.brown@intel.com> | 2007-11-20 01:18:37 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-20 01:18:37 -0500 |
| commit | 95b00786f3b8fa99f53931361beeb4c10504ad87 (patch) | |
| tree | 0f2de0587f08f1d0bd80a70a3d18ca5eb3dfb75c /include | |
| parent | 22201f7402851b9a47e64139ca589bd8555f7138 (diff) | |
| parent | ddc081a19585c8ba5aad437779950c2ef215360a (diff) | |
Pull cpuidle into release branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/processor.h | 1 | ||||
| -rw-r--r-- | include/linux/cpuidle.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 26d79f6db8a..76411b1fc4f 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -78,7 +78,6 @@ struct acpi_processor_cx { struct acpi_processor_power { struct cpuidle_device dev; struct acpi_processor_cx *state; - struct acpi_processor_cx *bm_state; unsigned long bm_check_timestamp; u32 default_state; u32 bm_activity; diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 16a51546db4..c4e00161a24 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -92,6 +92,7 @@ struct cpuidle_device { struct kobject kobj; struct completion kobj_unregister; void *governor_data; + struct cpuidle_state *safe_state; }; DECLARE_PER_CPU(struct cpuidle_device *, cpuidle_devices); |