diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-25 08:10:36 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-25 08:10:36 +0200 |
| commit | aca209e5e654951a3a90f5aaa8e04e0c470993b4 (patch) | |
| tree | 5de472175d8edcbdf7a98022af7bf650bde761e9 /include/acpi/acpixf.h | |
| parent | Linux 2.6.36 (diff) | |
| parent | Subject: [PATCH] ACPICA: Fix Scope() op in module level code (diff) | |
| download | linux-aca209e5e654951a3a90f5aaa8e04e0c470993b4.tar.xz linux-aca209e5e654951a3a90f5aaa8e04e0c470993b4.zip | |
Merge branch 'acpica' into release
Conflicts:
drivers/acpi/acpica/aclocal.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/acpixf.h')
| -rw-r--r-- | include/acpi/acpixf.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 984cdc62e30b..7db647c96283 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -47,7 +47,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20100702 +#define ACPI_CA_VERSION 0x20101013 #include "actypes.h" #include "actbl.h" @@ -72,6 +72,7 @@ extern u8 acpi_gbl_truncate_io_addresses; extern u32 acpi_current_gpe_count; extern struct acpi_table_fadt acpi_gbl_FADT; +extern u8 acpi_gbl_system_awake_and_running; extern u32 acpi_rsdt_forced; /* @@ -105,6 +106,10 @@ const char *acpi_format_exception(acpi_status exception); acpi_status acpi_purge_cached_objects(void); +acpi_status acpi_install_interface(acpi_string interface_name); + +acpi_status acpi_remove_interface(acpi_string interface_name); + /* * ACPI Memory management */ @@ -263,6 +268,8 @@ acpi_remove_gpe_handler(acpi_handle gpe_device, acpi_status acpi_install_exception_handler(acpi_exception_handler handler); #endif +acpi_status acpi_install_interface_handler(acpi_interface_handler handler); + /* * Event interfaces */ |