diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 19:07:19 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 19:07:19 +0200 |
| commit | 1b982baf75e7d9585967fcfccd05b77bf9054010 (patch) | |
| tree | d997a2b60ea7eee0c6a17eb82cd4e7a0e3b09749 /drivers/acpi/acpica/acpredef.h | |
| parent | Merge branch 'for-4.7/dsm' into libnvdimm-for-next (diff) | |
| parent | nfit: export subsystem ids as attributes (diff) | |
| download | linux-1b982baf75e7d9585967fcfccd05b77bf9054010.tar.xz linux-1b982baf75e7d9585967fcfccd05b77bf9054010.zip | |
Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next
Diffstat (limited to 'drivers/acpi/acpica/acpredef.h')
| -rw-r--r-- | drivers/acpi/acpica/acpredef.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h index 5faeab41e302..4ca426b55509 100644 --- a/drivers/acpi/acpica/acpredef.h +++ b/drivers/acpi/acpica/acpredef.h @@ -523,6 +523,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (4 Int) */ PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0), + {{"_FIT", METHOD_0ARGS, + METHOD_RETURNS(ACPI_RTYPE_BUFFER)}}, /* ACPI 6.0 */ + {{"_FIX", METHOD_0ARGS, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints) */ PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0), @@ -1053,6 +1056,12 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER)}}, + {{"_WPC", METHOD_0ARGS, + METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* ACPI 6.1 */ + + {{"_WPP", METHOD_0ARGS, + METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* ACPI 6.1 */ + PACKAGE_INFO(0, 0, 0, 0, 0, 0) /* Table terminator */ }; #else |