Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / acpi / acpica / dsobject.c

diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 15c628e6aa0032f0a2486c8f6ade61fc3b8f556d..dab3f48f0b42938066b145c58a7b1c231139944d 100644 (file)
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -565,7 +565,7 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,
 
        /* Re-type the object according to its argument */
 
-       node->type = ACPI_GET_OBJECT_TYPE(obj_desc);
+       node->type = obj_desc->common.type;
 
        /* Attach obj to node */
 
@@ -619,7 +619,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
 
        /* Perform per-object initialization */
 
-       switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+       switch (obj_desc->common.type) {
        case ACPI_TYPE_BUFFER:
 
                /*
@@ -803,7 +803,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
        default:
 
                ACPI_ERROR((AE_INFO, "Unimplemented data type: %X",
-                           ACPI_GET_OBJECT_TYPE(obj_desc)));
+                           obj_desc->common.type));
 
                status = AE_AML_OPERAND_TYPE;
                break;