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/acpi | |
| parent | 22201f7402851b9a47e64139ca589bd8555f7138 (diff) | |
| parent | ddc081a19585c8ba5aad437779950c2ef215360a (diff) | |
Pull cpuidle into release branch
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/processor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 26d79f6db8a0..76411b1fc4fd 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -78,7 +78,6 @@ struct acpi_processor_cx { | |||
| 78 | struct acpi_processor_power { | 78 | struct acpi_processor_power { |
| 79 | struct cpuidle_device dev; | 79 | struct cpuidle_device dev; |
| 80 | struct acpi_processor_cx *state; | 80 | struct acpi_processor_cx *state; |
| 81 | struct acpi_processor_cx *bm_state; | ||
| 82 | unsigned long bm_check_timestamp; | 81 | unsigned long bm_check_timestamp; |
| 83 | u32 default_state; | 82 | u32 default_state; |
| 84 | u32 bm_activity; | 83 | u32 bm_activity; |