diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:04:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:04:50 -0700 |
| commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
| tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /include/acpi/actbl.h | |
| parent | [PATCH] v4l: broken hybrid dvb inclusion (diff) | |
| parent | [ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc... (diff) | |
| download | linux-dev-3f603ed319d5120e883e64ac5967b2fc848fc43b.tar.xz linux-dev-3f603ed319d5120e883e64ac5967b2fc848fc43b.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'include/acpi/actbl.h')
| -rw-r--r-- | include/acpi/actbl.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h index 7eee731112b1..b5cdcca444c8 100644 --- a/include/acpi/actbl.h +++ b/include/acpi/actbl.h @@ -133,7 +133,6 @@ struct acpi_table_header /* ACPI common table header */ #define DUAL_PIC 0 #define MULTIPLE_APIC 1 - /* Master MADT */ struct multiple_apic_table @@ -144,7 +143,6 @@ struct multiple_apic_table u32 reserved1 : 31; }; - /* Values for Type in APIC_HEADER_DEF */ #define APIC_PROCESSOR 0 |