Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[powerpc.git] / include / acpi / acnamesp.h

diff --git a/include/acpi/acnamesp.h b/include/acpi/acnamesp.h
index 535b7e1..5ef38a6 100644 (file)
--- a/include/acpi/acnamesp.h
+++ b/include/acpi/acnamesp.h
@@ -100,10 +100,8 @@ acpi_ns_walk_namespace(acpi_object_type type,
                       acpi_walk_callback user_function,
                       void *context, void **return_value);
 
-struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
-                                                 struct acpi_namespace_node
-                                                 *parent,
-                                                 struct acpi_namespace_node
+struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct acpi_namespace_node
+                                                 *parent, struct acpi_namespace_node
                                                  *child);
 
 /*