Merge branch 'bugzilla-15886' into release

This commit is contained in:
Len Brown
2010-07-22 18:18:28 -04:00
3 changed files with 17 additions and 2 deletions

View File

@@ -48,7 +48,7 @@ struct acpi_power_register {
u8 space_id;
u8 bit_width;
u8 bit_offset;
u8 reserved;
u8 access_size;
u64 address;
} __attribute__ ((packed));
@@ -63,6 +63,7 @@ struct acpi_processor_cx {
u32 power;
u32 usage;
u64 time;
u8 bm_sts_skip;
char desc[ACPI_CX_DESC_LEN];
};