diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-07 00:45:27 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-07 00:45:27 +0200 |
| commit | 23a75c52bef3ed0b688e45e352ce26069bdfd97f (patch) | |
| tree | d9f0348ad9031f8552f6de067c76a6da1e24b03c /include/acpi/acpixf.h | |
| parent | d48dc067450d84324067f4472dc0b169e9af4454 (diff) | |
| parent | fd0c940522c5c5b281b7a4fe3497fabf74bd8911 (diff) | |
Merge back earlier ACPICA material.
Diffstat (limited to 'include/acpi/acpixf.h')
| -rw-r--r-- | include/acpi/acpixf.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 44f5e974960..913d0765adb 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20140214 +#define ACPI_CA_VERSION 0x20140325 #include <acpi/acconfig.h> #include <acpi/actypes.h> @@ -75,7 +75,7 @@ extern u8 acpi_gbl_auto_serialize_methods; extern u8 acpi_gbl_copy_dsdt_locally; extern u8 acpi_gbl_create_osi_method; extern u8 acpi_gbl_disable_auto_repair; -extern u8 acpi_gbl_disable_ssdt_table_load; +extern u8 acpi_gbl_disable_ssdt_table_install; extern u8 acpi_gbl_do_not_use_xsdt; extern u8 acpi_gbl_enable_aml_debug_object; extern u8 acpi_gbl_enable_interpreter_slack; @@ -164,6 +164,9 @@ acpi_decode_pld_buffer(u8 *in_buffer, /* * ACPI table load/unload interfaces */ +acpi_status __init +acpi_install_table(acpi_physical_address address, u8 physical); + acpi_status acpi_load_table(struct acpi_table_header *table); acpi_status acpi_unload_parent_table(acpi_handle object); |