diff options
author | Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> | 2007-02-02 11:48:22 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-02 21:14:28 -0500 |
commit | ad363f80c386bc4701b1bc2cdf08ca9b96a9337b (patch) | |
tree | e325a8149cc7844a17ed74392a4a670c6da7671d /include/linux/acpi.h | |
parent | cee324b145a1e5488b34191de670e5ed1d346ebb (diff) |
ACPICA: Remove duplicate table definitions.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 88cb1fe22b48..5a2b3633220e 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -60,15 +60,6 @@ typedef struct { | |||
60 | 60 | ||
61 | /* Multiple APIC Description Table (MADT) */ | 61 | /* Multiple APIC Description Table (MADT) */ |
62 | 62 | ||
63 | struct acpi_table_madt { | ||
64 | struct acpi_table_header header; | ||
65 | u32 lapic_address; | ||
66 | struct { | ||
67 | u32 pcat_compat:1; | ||
68 | u32 reserved:31; | ||
69 | } flags; | ||
70 | } __attribute__ ((packed)); | ||
71 | |||
72 | enum acpi_madt_entry_id { | 63 | enum acpi_madt_entry_id { |
73 | ACPI_MADT_LAPIC = 0, | 64 | ACPI_MADT_LAPIC = 0, |
74 | ACPI_MADT_IOAPIC, | 65 | ACPI_MADT_IOAPIC, |
@@ -185,15 +176,6 @@ struct acpi_gen_regaddr { | |||
185 | u32 addrh; | 176 | u32 addrh; |
186 | } __attribute__ ((packed)); | 177 | } __attribute__ ((packed)); |
187 | 178 | ||
188 | struct acpi_table_hpet { | ||
189 | struct acpi_table_header header; | ||
190 | u32 id; | ||
191 | struct acpi_gen_regaddr addr; | ||
192 | u8 number; | ||
193 | u16 min_tick; | ||
194 | u8 page_protect; | ||
195 | } __attribute__ ((packed)); | ||
196 | |||
197 | /* | 179 | /* |
198 | * Simple Boot Flags | 180 | * Simple Boot Flags |
199 | * http://www.microsoft.com/whdc/hwdev/resources/specs/simp_bios.mspx | 181 | * http://www.microsoft.com/whdc/hwdev/resources/specs/simp_bios.mspx |
@@ -218,12 +200,6 @@ struct acpi_table_sbf | |||
218 | * http://www.microsoft.com/whdc/hwdev/platform/proc/SRAT.mspx | 200 | * http://www.microsoft.com/whdc/hwdev/platform/proc/SRAT.mspx |
219 | */ | 201 | */ |
220 | 202 | ||
221 | struct acpi_table_srat { | ||
222 | struct acpi_table_header header; | ||
223 | u32 table_revision; | ||
224 | u64 reserved; | ||
225 | } __attribute__ ((packed)); | ||
226 | |||
227 | enum acpi_srat_entry_id { | 203 | enum acpi_srat_entry_id { |
228 | ACPI_SRAT_PROCESSOR_AFFINITY = 0, | 204 | ACPI_SRAT_PROCESSOR_AFFINITY = 0, |
229 | ACPI_SRAT_MEMORY_AFFINITY, | 205 | ACPI_SRAT_MEMORY_AFFINITY, |
@@ -267,36 +243,6 @@ enum acpi_address_range_id { | |||
267 | ACPI_ADDRESS_RANGE_COUNT | 243 | ACPI_ADDRESS_RANGE_COUNT |
268 | }; | 244 | }; |
269 | 245 | ||
270 | /* | ||
271 | * System Locality Information Table (SLIT) | ||
272 | * see http://devresource.hp.com/devresource/docs/techpapers/ia64/slit.pdf | ||
273 | */ | ||
274 | |||
275 | struct acpi_table_slit { | ||
276 | struct acpi_table_header header; | ||
277 | u64 localities; | ||
278 | u8 entry[1]; /* real size = localities^2 */ | ||
279 | } __attribute__ ((packed)); | ||
280 | |||
281 | /* Smart Battery Description Table (SBST) */ | ||
282 | |||
283 | struct acpi_table_sbst { | ||
284 | struct acpi_table_header header; | ||
285 | u32 warning; /* Warn user */ | ||
286 | u32 low; /* Critical sleep */ | ||
287 | u32 critical; /* Critical shutdown */ | ||
288 | } __attribute__ ((packed)); | ||
289 | |||
290 | /* Embedded Controller Boot Resources Table (ECDT) */ | ||
291 | |||
292 | struct acpi_table_ecdt { | ||
293 | struct acpi_table_header header; | ||
294 | struct acpi_generic_address ec_control; | ||
295 | struct acpi_generic_address ec_data; | ||
296 | u32 uid; | ||
297 | u8 gpe_bit; | ||
298 | char ec_id[0]; | ||
299 | } __attribute__ ((packed)); | ||
300 | 246 | ||
301 | /* PCI MMCONFIG */ | 247 | /* PCI MMCONFIG */ |
302 | 248 | ||
@@ -309,11 +255,6 @@ struct acpi_table_mcfg_config { | |||
309 | u8 end_bus_number; | 255 | u8 end_bus_number; |
310 | u8 reserved[4]; | 256 | u8 reserved[4]; |
311 | } __attribute__ ((packed)); | 257 | } __attribute__ ((packed)); |
312 | struct acpi_table_mcfg { | ||
313 | struct acpi_table_header header; | ||
314 | u8 reserved[8]; | ||
315 | struct acpi_table_mcfg_config config[0]; | ||
316 | } __attribute__ ((packed)); | ||
317 | 258 | ||
318 | /* Table Handlers */ | 259 | /* Table Handlers */ |
319 | 260 | ||