This commit was generated by cvs2svn to compensate for changes in r70243,

which included commits to RCS files with non-trunk default branches.

1 files changed, 9 insertions, 16 deletions

diff --git a/sys/contrib/dev/acpica/Subsystem/Dispatcher/dswstate.c b/sys/contrib/dev/acpica/Subsystem/Dispatcher/dswstate.c
index 9ec067b..f4494de 100644
--- a/sys/contrib/dev/acpica/Subsystem/Dispatcher/dswstate.c
+++ b/sys/contrib/dev/acpica/Subsystem/Dispatcher/dswstate.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dswstate - Dispatcher parse tree walk management routines
- *              $Revision: 35 $
+ *              $Revision: 36 $
  *
  *****************************************************************************/
 
@@ -9,8 +9,8 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999, Intel Corp.  All rights
- * reserved.
+ * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
+ * All rights reserved.
  *
  * 2. License
  *
@@ -212,7 +212,6 @@ AcpiDsResultInsert (
 }
 
 
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDsResultRemove
@@ -415,13 +414,12 @@ AcpiDsResultPopFromBottom (
         ("DsResultPopFromBottom: Obj=%p [%s], Results=%p State=%p\n",
         *Object, (*Object) ? AcpiCmGetTypeName ((*Object)->Common.Type) : "NULL",
         State, WalkState));
-    
-    
+
+
     return (AE_OK);
 }
 
 
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDsResultPop
@@ -479,8 +477,6 @@ AcpiDsResultPush (
 }
 
 
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDsResultStackPush
@@ -490,7 +486,7 @@ AcpiDsResultPush (
  *
  * RETURN:      Status
  *
- * DESCRIPTION: 
+ * DESCRIPTION:
  *
  ******************************************************************************/
 
@@ -500,7 +496,7 @@ AcpiDsResultStackPush (
 {
     ACPI_GENERIC_STATE      *State;
 
-    
+
     State = AcpiCmCreateGenericState ();
     if (!State)
     {
@@ -508,7 +504,7 @@ AcpiDsResultStackPush (
     }
 
     AcpiCmPushGenericState (&WalkState->Results, State);
-    
+
     DEBUG_PRINT (TRACE_EXEC,
         ("DsResultStackPush: Results=%p State=%p\n",
         State, WalkState));
@@ -525,7 +521,7 @@ AcpiDsResultStackPush (
  *
  * RETURN:      Status
  *
- * DESCRIPTION: 
+ * DESCRIPTION:
  *
  ******************************************************************************/
 
@@ -559,8 +555,6 @@ AcpiDsResultStackPop (
 }
 
 
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDsObjStackDeleteAll
@@ -1095,7 +1089,6 @@ AcpiDsDeleteWalkState (
     }
 
 
-
     /* If walk cache is full, just free this wallkstate object */
 
     if (AcpiGbl_WalkStateCacheDepth >= MAX_WALK_CACHE_DEPTH)