Merge branch 'acpica' into release

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index b39d682a2140..64062b1be3ee 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -180,7 +180,11 @@ struct acpi_object_method {
         u8 sync_level;
         union acpi_operand_object *mutex;
         u8 *aml_start;
-        ACPI_INTERNAL_METHOD implementation;
+        union {
+                ACPI_INTERNAL_METHOD implementation;
+                union acpi_operand_object *handler;
+        } extra;
+
         u32 aml_length;
         u8 thread_count;
         acpi_owner_id owner_id;