summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-07-22 18:18:28 -0400
committerLen Brown <len.brown@intel.com>2010-07-22 18:18:28 -0400
commit4a973f2495fba8775d1c408b3ee7f2c19b19f13f (patch)
tree302484851e44029a208cce8c79294a82f25561d9 /include
parentbe48b11573952b467676b24de87d637e33339e7d (diff)
parentd3e7e99f2faf9f44ec0a3379f735b41c9173dfa1 (diff)
downloadlinux-4a973f2495fba8775d1c408b3ee7f2c19b19f13f.tar.gz
linux-4a973f2495fba8775d1c408b3ee7f2c19b19f13f.tar.bz2
linux-4a973f2495fba8775d1c408b3ee7f2c19b19f13f.zip
Merge branch 'bugzilla-15886' into release
Diffstat (limited to 'include')
-rw-r--r--include/acpi/processor.h3
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 {
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];
};