Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/acpi/parser/pswalk.c b/drivers/acpi/parser/pswalk.c
index 110d2ce917b6..9d20cb2ceb51 100644
--- a/drivers/acpi/parser/pswalk.c
+++ b/drivers/acpi/parser/pswalk.c
@@ -90,17 +90,15 @@ acpi_ps_delete_parse_tree (
                         }
                 }
 
-                /*
-                 * No more children, this Op is complete.
-                 */
+                /* No more children, this Op is complete. */
+
                 next = op->common.next;
                 parent = op->common.parent;
 
                 acpi_ps_free_op (op);
 
-                /*
-                 * If we are back to the starting point, the walk is complete.
-                 */
+                /* If we are back to the starting point, the walk is complete. */
+
                 if (op == subtree_root) {
                         return_VOID;
                 }
@@ -111,5 +109,6 @@ acpi_ps_delete_parse_tree (
                         op = parent;
                 }
         }
+
         return_VOID;
 }