Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 4d622981f61a..e5e448edca41 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -259,12 +259,10 @@ int acpi_get_node(acpi_handle *handle)
 {
         int pxm, node = -1;
 
-        ACPI_FUNCTION_TRACE("acpi_get_node");
-
         pxm = acpi_get_pxm(handle);
         if (pxm >= 0)
                 node = acpi_map_pxm_to_node(pxm);
 
-        return_VALUE(node);
+        return node;
 }
 EXPORT_SYMBOL(acpi_get_node);