mirror of
https://github.com/torvalds/linux.git
synced 2026-03-07 23:04:33 +01:00
Merge branch 'acpica'
Merge a fix updating the _CPC object definition in ACPICA to avoid printing a false-positive output package format warning on new platforms (Saket Dumbre) * acpica: ACPICA: Update the _CPC definition to match ACPI 6.6
This commit is contained in:
commit
084f843093
1 changed files with 3 additions and 2 deletions
|
|
@ -379,8 +379,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
|
|||
|
||||
{{"_CPC", METHOD_0ARGS,
|
||||
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints/Bufs) */
|
||||
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0,
|
||||
0, 0, 0),
|
||||
PACKAGE_INFO(ACPI_PTYPE1_VAR,
|
||||
ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER |
|
||||
ACPI_RTYPE_PACKAGE, 0, 0, 0, 0),
|
||||
|
||||
{{"_CR3", METHOD_0ARGS, /* ACPI 6.0 */
|
||||
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue