diff options
author | Len Brown <len.brown@intel.com> | 2006-06-15 15:19:48 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:19:48 -0400 |
commit | b3899c6613160b18f79e4356184de55311302fe4 (patch) | |
tree | 4aa7945bac59cbe5bb5d863be2d4ded285d3e936 /drivers/acpi/namespace/nsdumpdv.c | |
parent | 553698f944ed715dfe023b4cef07601f0ce735f0 (diff) | |
parent | 4c90ece249992c7a2e3fc921e5cdb8eb92193067 (diff) | |
download | linux-b3899c6613160b18f79e4356184de55311302fe4.tar.bz2 |
Pull acpica into release branch
Diffstat (limited to 'drivers/acpi/namespace/nsdumpdv.c')
-rw-r--r-- | drivers/acpi/namespace/nsdumpdv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c index aff899a935e3..c6bf5d30fca3 100644 --- a/drivers/acpi/namespace/nsdumpdv.c +++ b/drivers/acpi/namespace/nsdumpdv.c @@ -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 */ |