diff options
| author | Len Brown <len.brown@intel.com> | 2010-07-22 18:18:28 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-07-22 18:18:28 -0400 |
| commit | 4a973f2495fba8775d1c408b3ee7f2c19b19f13f (patch) | |
| tree | 302484851e44029a208cce8c79294a82f25561d9 /include | |
| parent | be48b11573952b467676b24de87d637e33339e7d (diff) | |
| parent | d3e7e99f2faf9f44ec0a3379f735b41c9173dfa1 (diff) | |
Merge branch 'bugzilla-15886' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/processor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index da565a48240e..a68ca8a11a53 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -48,7 +48,7 @@ struct acpi_power_register { | |||
| 48 | u8 space_id; | 48 | u8 space_id; |
| 49 | u8 bit_width; | 49 | u8 bit_width; |
| 50 | u8 bit_offset; | 50 | u8 bit_offset; |
| 51 | u8 reserved; | 51 | u8 access_size; |
| 52 | u64 address; | 52 | u64 address; |
| 53 | } __attribute__ ((packed)); | 53 | } __attribute__ ((packed)); |
| 54 | 54 | ||
| @@ -63,6 +63,7 @@ struct acpi_processor_cx { | |||
| 63 | u32 power; | 63 | u32 power; |
| 64 | u32 usage; | 64 | u32 usage; |
| 65 | u64 time; | 65 | u64 time; |
| 66 | u8 bm_sts_skip; | ||
| 66 | char desc[ACPI_CX_DESC_LEN]; | 67 | char desc[ACPI_CX_DESC_LEN]; |
| 67 | }; | 68 | }; |
| 68 | 69 | ||