diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
| commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
| tree | 74800e35129775413c13ce7caf036ca19e3ce56c /include/acpi/actbl.h | |
| parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
| parent | d8683a0cb5d09cb7f19feefa708424a84577e68f (diff) | |
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Signed-off-by: Len Brown <len.brown@intel.com>
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 */ | |||
| 133 | #define DUAL_PIC 0 | 133 | #define DUAL_PIC 0 |
| 134 | #define MULTIPLE_APIC 1 | 134 | #define MULTIPLE_APIC 1 |
| 135 | 135 | ||
| 136 | |||
| 137 | /* Master MADT */ | 136 | /* Master MADT */ |
| 138 | 137 | ||
| 139 | struct multiple_apic_table | 138 | struct multiple_apic_table |
| @@ -144,7 +143,6 @@ struct multiple_apic_table | |||
| 144 | u32 reserved1 : 31; | 143 | u32 reserved1 : 31; |
| 145 | }; | 144 | }; |
| 146 | 145 | ||
| 147 | |||
| 148 | /* Values for Type in APIC_HEADER_DEF */ | 146 | /* Values for Type in APIC_HEADER_DEF */ |
| 149 | 147 | ||
| 150 | #define APIC_PROCESSOR 0 | 148 | #define APIC_PROCESSOR 0 |