diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:21:11 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:21:11 +0100 |
| commit | 0faf996f4dd02a361158a705afcc31284d732276 (patch) | |
| tree | 9d0907fced6600cdd0d9cef78f532838220157f7 /include/acpi/actbl2.h | |
| parent | ee360d688c8e37f81c92039f76bebaddbe36befe (diff) | |
| parent | 45c9f78b25ad9ce6cdf259ac4b652e6783adcb23 (diff) | |
| download | linux-0faf996f4dd02a361158a705afcc31284d732276.tar.bz2 | |
Merge branch 'acpica'
* acpica: (35 commits)
ACPICA: Add __init for ACPICA initializers/finalizers.
ACPICA: Cleanup asmlinkage for ACPICA APIs.
ACPICA: Update acpidump related header file changes.
ACPICA: Update compilation environment settings.
ACPICA: Fix cached object deletion code.
ACPICA: Remove dead AOPOBJ_INVALID check.
ACPICA: Cleanup useless memset invocations.
ACPICA: Fix an ACPI_ALLOCATE_ZEROED() reversal.
ACPICA: Fix wrong object length returned by acpi_ut_get_simple_object_size().
ACPICA: Add new statistics interface.
ACPICA: Update DMAR table definitions.
ACPICA: Update RSDP table definitions.
ACPICA: Update namespace dump code.
ACPICA: Update check for setting the ANOBJ_IS_EXTERNAL flag.
ACPICA: Update default space handlers.
ACPICA: Update version to 20130927.
ACPICA: Update aclinux.h for new OSL override mechanism.
ACPICA: Add support to allow host OS to redefine individual OSL prototypes.
ACPICA: Simplify configuration of global ACPI_REDUCED_HARDWARE macro.
ACPICA: Fix indentation issues for macro invocations.
...
Diffstat (limited to 'include/acpi/actbl2.h')
| -rw-r--r-- | include/acpi/actbl2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index ffaac0e7e0c6..40f7ed115452 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -444,8 +444,8 @@ enum acpi_dmar_scope_type { }; struct acpi_dmar_pci_path { - u8 dev; - u8 fn; + u8 device; + u8 function; }; /* |