git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
acpi
/
acpica
/
nsload.c
diff --git
a/drivers/acpi/acpica/nsload.c
b/drivers/acpi/acpica/nsload.c
index
dcd7a6a
..
a7234e6
100644
(file)
--- a/
drivers/acpi/acpica/nsload.c
+++ b/
drivers/acpi/acpica/nsload.c
@@
-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);
}