vserver 1.9.3

[linux-2.6.git] / drivers / acpi / namespace / nsalloc.c

diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index f7a216c..89b9977 100644 (file)
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -267,7 +267,7 @@ acpi_ns_install_node (
        else {
 #ifdef ACPI_ALPHABETIC_NAMESPACE
                /*
-                * Walk the list whilst searching for the the correct
+                * Walk the list whilst searching for the correct
                 * alphabetic placement.
                 */
                previous_child_node = NULL;
@@ -496,14 +496,14 @@ acpi_ns_delete_namespace_subtree (
 
                        /* Check if this node has any children */
 
-                       if (acpi_ns_get_next_node (ACPI_TYPE_ANY, child_node, 0)) {
+                       if (acpi_ns_get_next_node (ACPI_TYPE_ANY, child_node, NULL)) {
                                /*
                                 * There is at least one child of this node,
                                 * visit the node
                                 */
                                level++;
                                parent_node   = child_node;
-                               child_node    = 0;
+                               child_node    = NULL;
                        }
                }
                else {