Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / drivers / acpi / acpica / nsload.c

diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index a0ba9e12379efa250728e801a6f2eec1ec649401..a7234e60e9858c29fbf80cd10bf06a649ee9e898 100644 (file)
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -128,12 +128,12 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
         * parse trees.
         */
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                         "**** Begin Table Method Parsing and Object Initialization ****\n"));
+                         "**** Begin Table Method Parsing and Object Initialization\n"));
 
        status = acpi_ds_initialize_objects(table_index, node);
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                         "**** Completed Table Method Parsing and Object Initialization ****\n"));
+                         "**** Completed Table Method Parsing and Object Initialization\n"));
 
        return_ACPI_STATUS(status);
 }
@@ -270,8 +270,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle)
 
        /* Now delete the starting object, and we are done */
 
-       acpi_ns_delete_node(child_handle);
-
+       acpi_ns_remove_node(child_handle);
        return_ACPI_STATUS(AE_OK);
 }