diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 14:16:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 14:16:25 -0400 |
commit | 32fb6c17566ec66de87324a834c7776f40e35e78 (patch) | |
tree | 87b8ed5d66495536fbb452255c3eacd1cfb0c43a /include/acpi/actbl1.h | |
parent | 45e36c1666aa6c8b0c538abcf984b336184d8c3f (diff) | |
parent | 7ec0a7290797f57b780f792d12f4bcc19c83aa4f (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (140 commits)
ACPI: processor: use .notify method instead of installing handler directly
ACPI: button: use .notify method instead of installing handler directly
ACPI: support acpi_device_ops .notify methods
toshiba-acpi: remove MAINTAINERS entry
ACPI: battery: asynchronous init
acer-wmi: Update copyright notice & documentation
acer-wmi: Cleanup the failure cleanup handling
acer-wmi: Blacklist Acer Aspire One
video: build fix
thinkpad-acpi: rework brightness support
thinkpad-acpi: enhanced debugging messages for the fan subdriver
thinkpad-acpi: enhanced debugging messages for the hotkey subdriver
thinkpad-acpi: enhanced debugging messages for rfkill subdrivers
thinkpad-acpi: restrict access to some firmware LEDs
thinkpad-acpi: remove HKEY disable functionality
thinkpad-acpi: add new debug helpers and warn of deprecated atts
thinkpad-acpi: add missing log levels
thinkpad-acpi: cleanup debug helpers
thinkpad-acpi: documentation cleanup
thinkpad-acpi: drop ibm-acpi alias
...
Diffstat (limited to 'include/acpi/actbl1.h')
-rw-r--r-- | include/acpi/actbl1.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 18963b968114..59ade0752473 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h | |||
@@ -1016,9 +1016,9 @@ struct acpi_madt_interrupt_source { | |||
1016 | struct acpi_madt_local_x2apic { | 1016 | struct acpi_madt_local_x2apic { |
1017 | struct acpi_subtable_header header; | 1017 | struct acpi_subtable_header header; |
1018 | u16 reserved; /* Reserved - must be zero */ | 1018 | u16 reserved; /* Reserved - must be zero */ |
1019 | u32 local_apic_id; /* Processor X2_APIC ID */ | 1019 | u32 local_apic_id; /* Processor x2APIC ID */ |
1020 | u32 lapic_flags; | 1020 | u32 lapic_flags; |
1021 | u32 uid; /* Extended X2_APIC processor ID */ | 1021 | u32 uid; /* ACPI processor UID */ |
1022 | }; | 1022 | }; |
1023 | 1023 | ||
1024 | /* 10: Local X2APIC NMI (07/2008) */ | 1024 | /* 10: Local X2APIC NMI (07/2008) */ |
@@ -1026,7 +1026,7 @@ struct acpi_madt_local_x2apic { | |||
1026 | struct acpi_madt_local_x2apic_nmi { | 1026 | struct acpi_madt_local_x2apic_nmi { |
1027 | struct acpi_subtable_header header; | 1027 | struct acpi_subtable_header header; |
1028 | u16 inti_flags; | 1028 | u16 inti_flags; |
1029 | u32 uid; /* Processor X2_APIC ID */ | 1029 | u32 uid; /* ACPI processor UID */ |
1030 | u8 lint; /* LINTn to which NMI is connected */ | 1030 | u8 lint; /* LINTn to which NMI is connected */ |
1031 | u8 reserved[3]; | 1031 | u8 reserved[3]; |
1032 | }; | 1032 | }; |