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 master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
drivers
/
acpi
/
namespace
/
nsdumpdv.c
diff --git
a/drivers/acpi/namespace/nsdumpdv.c
b/drivers/acpi/namespace/nsdumpdv.c
index
aff899a
..
5097e16
100644
(file)
--- a/
drivers/acpi/namespace/nsdumpdv.c
+++ b/
drivers/acpi/namespace/nsdumpdv.c
@@
-5,7
+5,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 200
6
, R. Byron Moore
+ * Copyright (C) 2000 - 200
7
, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* 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_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);
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));
info->hardware_id.value,
ACPI_FORMAT_UINT64(info->address),
info->current_status));
- ACPI_
MEM_
FREE(info);
+ ACPI_FREE(info);
}
return (status);
}
return (status);
@@
-115,7
+115,7
@@
void acpi_ns_dump_root_devices(void)
acpi_handle sys_bus_handle;
acpi_status status;
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 */
/* Only dump the table if tracing is enabled */