Pull acpica into release branch

[pandora-kernel.git] / drivers / acpi / namespace / nsdumpdv.c

diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c
index 55de883..c6bf5d3 100644 (file)
--- a/drivers/acpi/namespace/nsdumpdv.c
+++ b/drivers/acpi/namespace/nsdumpdv.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -74,7 +74,7 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
        acpi_status status;
        u32 i;
 
-       ACPI_FUNCTION_NAME("ns_dump_one_device");
+       ACPI_FUNCTION_NAME(ns_dump_one_device);
 
        status =
            acpi_ns_dump_one_object(obj_handle, level, context, return_value);
@@ -92,7 +92,7 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
                                      info->hardware_id.value,
                                      ACPI_FORMAT_UINT64(info->address),
                                      info->current_status));
-               ACPI_MEM_FREE(info);
+               ACPI_FREE(info);
        }
 
        return (status);
@@ -115,7 +115,7 @@ void acpi_ns_dump_root_devices(void)
        acpi_handle sys_bus_handle;
        acpi_status status;
 
-       ACPI_FUNCTION_NAME("ns_dump_root_devices");
+       ACPI_FUNCTION_NAME(ns_dump_root_devices);
 
        /* Only dump the table if tracing is enabled */