diff options
| author | Len Brown <len.brown@intel.com> | 2010-05-28 16:18:20 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-05-28 16:18:20 -0400 |
| commit | edbe77ba94217868caf5f391d2a083729bef3742 (patch) | |
| tree | 6525dc173ea0f94236b1ad01c1092b9f89d11d7a /include/acpi | |
| parent | 64a4222f7e087b5030eff0f6e47285696089d983 (diff) | |
| parent | 0dc698b93f3eecdda43b22232131324eb41e510c (diff) | |
Merge branch 'misc-2.6.35' into release
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/processor.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 86825ddbe14..da565a48240 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -52,17 +52,6 @@ struct acpi_power_register { u64 address; } __attribute__ ((packed)); -struct acpi_processor_cx_policy { - u32 count; - struct acpi_processor_cx *state; - struct { - u32 time; - u32 ticks; - u32 count; - u32 bm; - } threshold; -}; - struct acpi_processor_cx { u8 valid; u8 type; @@ -74,8 +63,6 @@ struct acpi_processor_cx { u32 power; u32 usage; u64 time; - struct acpi_processor_cx_policy promotion; - struct acpi_processor_cx_policy demotion; char desc[ACPI_CX_DESC_LEN]; }; |