diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-12 00:56:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-12 00:56:15 -0400 |
| commit | d9a799d197da16fcfb1e872e82ee6cdf7fe8f7ab (patch) | |
| tree | e4100a27d05d5fc9286a3bb8e7ebe5b8d9618e66 /include/acpi | |
| parent | a48ecc771852158eb7b9ace242f0a6226a3907b7 (diff) | |
| parent | b681f7d9ab4d697a214fa4428795790c3a937a89 (diff) | |
| download | linux-d9a799d197da16fcfb1e872e82ee6cdf7fe8f7ab.tar.bz2 | |
Merge branch 'acpica-cherry-pick' into release
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acexcep.h | 2 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h index 5958d7845bd5..17714beb868e 100644 --- a/include/acpi/acexcep.h +++ b/include/acpi/acexcep.h @@ -212,7 +212,7 @@ char const *acpi_gbl_exception_names_env[] = { "AE_NO_GLOBAL_LOCK", "AE_ABORT_METHOD", "AE_SAME_HANDLER", - "AE_WAKE_ONLY_GPE", + "AE_NO_HANDLER", "AE_OWNER_ID_LIMIT" }; diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 0e4ab1fe5966..1371cc997393 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -69,6 +69,7 @@ extern acpi_name acpi_gbl_trace_method_name; extern u32 acpi_gbl_trace_flags; extern u8 acpi_gbl_enable_aml_debug_object; extern u8 acpi_gbl_copy_dsdt_locally; +extern u8 acpi_gbl_truncate_io_addresses; extern u32 acpi_current_gpe_count; extern struct acpi_table_fadt acpi_gbl_FADT; |