diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-04-06 16:23:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-04-06 16:23:31 +0200 |
| commit | fd0360583a4fab45fbb7f1cef9504e9fd82c3737 (patch) | |
| tree | af1b54123bb8de6d786f91b8a6fa50b11e01a142 /drivers/acpi/acpica/dswload.c | |
| parent | 696ac2e3bf267f5a2b2ed7d34e64131f2287d0ad (diff) | |
| parent | 6461e59cc2bc3b40da768159a1e64c01401cf336 (diff) | |
Merge branch 'acpica'
* acpica:
ACPICA: Update version 20200326
ACPICA: Fixes for acpiExec namespace init file
ACPICA: Add NHLT table signature
ACPICA: WSMT: Fix typo, no functional change
ACPICA: utilities: fix sprintf()
ACPICA: acpiexec: remove redeclaration of acpi_gbl_db_opt_no_region_support
ACPICA: Change PlatformCommChannel ASL keyword to PCC
ACPICA: Fix IVRS IVHD type 10h reserved field name
ACPICA: Implement IVRS IVHD type 11h parsing
ACPICA: Fix a typo in a comment field
Diffstat (limited to 'drivers/acpi/acpica/dswload.c')
| -rw-r--r-- | drivers/acpi/acpica/dswload.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c index 697974e37edf..27069325b6de 100644 --- a/drivers/acpi/acpica/dswload.c +++ b/drivers/acpi/acpica/dswload.c @@ -14,7 +14,6 @@ #include "acdispat.h" #include "acinterp.h" #include "acnamesp.h" - #ifdef ACPI_ASL_COMPILER #include "acdisasm.h" #endif @@ -399,7 +398,6 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state) union acpi_parse_object *op; acpi_object_type object_type; acpi_status status = AE_OK; - #ifdef ACPI_ASL_COMPILER u8 param_count; #endif |