diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-09-15 20:29:00 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-09-15 20:29:00 -0700 |
| commit | dde9dfb2d3d046de89808aeedbd249f300810cac (patch) | |
| tree | d653a30493dfded6366a82d0abb0b45d77ff6d04 /include | |
| parent | 959a9729fcbb5758c99d444301ec0af6172eac2f (diff) | |
| parent | 11df44b72f17aab958b3edfc8c779d887957dfc3 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-acpi
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 1bdcda4d36c8..3cca03f5d6c8 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -106,6 +106,15 @@ struct acpi_table_xsdt { u64 entry[1]; } __attribute__ ((packed)); +/* Fixed ACPI Description Table (FADT) */ + +struct acpi_table_fadt { + struct acpi_table_header header; + u32 facs_addr; + u32 dsdt_addr; + /* ... */ +} __attribute__ ((packed)); + /* Multiple APIC Description Table (MADT) */ struct acpi_table_madt { @@ -314,7 +323,7 @@ enum acpi_table_id { ACPI_DSDT, ACPI_ECDT, ACPI_ETDT, - ACPI_FACP, + ACPI_FADT, ACPI_FACS, ACPI_OEMX, ACPI_PSDT, @@ -340,6 +349,7 @@ int acpi_numa_init (void); int acpi_table_init (char *cmdline); int acpi_table_parse (enum acpi_table_id id, acpi_table_handler handler); +int acpi_get_table_header_early (enum acpi_table_id id, struct acpi_table_header **header); int acpi_table_parse_madt (enum acpi_madt_entry_id id, acpi_madt_entry_handler handler); int acpi_table_parse_srat (enum acpi_srat_entry_id id, acpi_madt_entry_handler handler); void acpi_table_print (struct acpi_table_header *header, unsigned long phys_addr); @@ -391,9 +401,8 @@ int acpi_pci_irq_init (void); #ifdef CONFIG_ACPI -int acpi_init(void); +int acpi_blacklisted(void); #endif /*CONFIG_ACPI*/ - #endif /*_LINUX_ACPI_H*/ |