diff options
| author | Jiri Kosina | 2010-08-04 15:14:38 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2010-08-04 15:14:38 +0200 |
| commit | d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f (patch) | |
| tree | 854ab394486288d40fa8179cbfaf66e8bdc44b0f /include/acpi/processor.h | |
| parent | fix comment typo "choosed" -> "chosen" (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw (diff) | |
| download | kernel-qcow2-linux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.tar.gz kernel-qcow2-linux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.tar.xz kernel-qcow2-linux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'include/acpi/processor.h')
| -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 { 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]; }; |