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 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
acpi
/
namespace
/
nsnames.c
diff --git
a/drivers/acpi/namespace/nsnames.c
b/drivers/acpi/namespace/nsnames.c
index
ba812f4
..
cbd94af
100644
(file)
--- a/
drivers/acpi/namespace/nsnames.c
+++ b/
drivers/acpi/namespace/nsnames.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
@@
-132,7
+132,7
@@
char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
char *name_buffer;
acpi_size size;
char *name_buffer;
acpi_size size;
- ACPI_FUNCTION_TRACE_PTR(
"ns_get_external_pathname"
, node);
+ ACPI_FUNCTION_TRACE_PTR(
ns_get_external_pathname
, node);
/* Calculate required buffer size based on depth below root */
/* Calculate required buffer size based on depth below root */
@@
-213,7
+213,7
@@
acpi_ns_handle_to_pathname(acpi_handle target_handle,
struct acpi_namespace_node *node;
acpi_size required_size;
struct acpi_namespace_node *node;
acpi_size required_size;
- ACPI_FUNCTION_TRACE_PTR(
"ns_handle_to_pathname"
, target_handle);
+ ACPI_FUNCTION_TRACE_PTR(
ns_handle_to_pathname
, target_handle);
node = acpi_ns_map_handle_to_node(target_handle);
if (!node) {
node = acpi_ns_map_handle_to_node(target_handle);
if (!node) {