aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi/acnamesp.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-02-08 09:43:08 +1100
committerPaul Mackerras <paulus@samba.org>2006-02-08 09:43:08 +1100
commit8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (patch)
treea3c34ad86ccdc904bb43af6cd1cb163231c29276 /include/acpi/acnamesp.h
parent[PATCH] PPC32 8xx: support for the physmapped flash on m8xx (diff)
parent[PATCH] powerpc: Lindent platforms/83xx (diff)
downloadlinux-dev-8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d.tar.xz
linux-dev-8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'include/acpi/acnamesp.h')
-rw-r--r--include/acpi/acnamesp.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/acpi/acnamesp.h b/include/acpi/acnamesp.h
index dd3501f7e5d6..b667a804fc8a 100644
--- a/include/acpi/acnamesp.h
+++ b/include/acpi/acnamesp.h
@@ -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
@@ -263,13 +263,11 @@ u32 acpi_ns_local(acpi_object_type type);
void
acpi_ns_report_error(char *module_name,
u32 line_number,
- u32 component_id,
char *internal_name, acpi_status lookup_status);
void
acpi_ns_report_method_error(char *module_name,
u32 line_number,
- u32 component_id,
char *message,
struct acpi_namespace_node *node,
char *path, acpi_status lookup_status);