diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-03-30 14:53:36 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-03-30 14:53:36 +0200 |
| commit | 6d582d7e31b67f84e544ba466edfac4d042e2d78 (patch) | |
| tree | 9c00f4f28e1737786db39b679d476d50f7758c71 /include/acpi | |
| parent | ecb9c790999fd6c5af0f44783bd0217f0b89ec2b (diff) | |
| parent | c7be17a6b41a67835ce4be33a0c38cf473d54c66 (diff) | |
| download | linux-6d582d7e31b67f84e544ba466edfac4d042e2d78.tar.gz linux-6d582d7e31b67f84e544ba466edfac4d042e2d78.tar.bz2 linux-6d582d7e31b67f84e544ba466edfac4d042e2d78.zip | |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20200214
ACPICA: Fix a couple of typos
ACPICA: use acpi_size instead of u32 for prefix_path_length
ACPICA: cast length arguement to acpi_ns_build_normalized_path() as u32
ACPICA: cast the result of the pointer difference to u32
ACPICA: Table Manager: Update comments in a function header
ACPICA: Enable sleep button on ACPI legacy wake
ACPICA: Fix a comment "enable" fixed events -> "disable" all fixed events.
ACPICA: ASL-ASL+ converter: make root file a parameter for cv_init_file_tree
ACPICA: ASL-ASL+ converter: remove function parameters from cv_init_file_tree()
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpixf.h | 2 | ||||
| -rw-r--r-- | include/acpi/actbl1.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 8e8be989c2a6..f7fd67dafd36 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -12,7 +12,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20200110 +#define ACPI_CA_VERSION 0x20200214 #include <acpi/acconfig.h> #include <acpi/actypes.h> diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 02d06b79e1cd..43549547ed3e 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -862,7 +862,7 @@ enum acpi_erst_instructions { /* Command status return values */ enum acpi_erst_command_status { - ACPI_ERST_SUCESS = 0, + ACPI_ERST_SUCCESS = 0, ACPI_ERST_NO_SPACE = 1, ACPI_ERST_NOT_AVAILABLE = 2, ACPI_ERST_FAILURE = 3, |