diff --git a/[refs] b/[refs] index 31f880ac048f..c2c2fc13e65a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23d3e055beb12db2a3b91dfeee474c4d5ecc13b9 +refs/heads/master: 8d5c54b65b20bf81fa9841a27143e2f71f3a7756 diff --git a/trunk/include/acpi/acobject.h b/trunk/include/acpi/acobject.h index e9657dac69b7..0ca39265bb0f 100644 --- a/trunk/include/acpi/acobject.h +++ b/trunk/include/acpi/acobject.h @@ -379,6 +379,13 @@ union acpi_operand_object { struct acpi_object_extra extra; struct acpi_object_data data; struct acpi_object_cache_list cache; + + /* + * Add namespace node to union in order to simplify code that accepts both + * ACPI_OPERAND_OBJECTs and ACPI_NAMESPACE_NODEs. The structures share + * a common descriptor_type field in order to differentiate them. + */ + struct acpi_namespace_node node; }; /******************************************************************************