1 files changed, 9 insertions, 9 deletions
diff --git a/sys/contrib/dev/acpica/dswscope.c b/sys/contrib/dev/acpica/dswscope.c
index 57571e8..d34808e 100644
--- a/sys/contrib/dev/acpica/dswscope.c
+++ b/sys/contrib/dev/acpica/dswscope.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dswscope - Scope stack manipulation
- *              $Revision: 49 $
+ *              $Revision: 52 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -122,7 +122,7 @@
 
 
 #define _COMPONENT          ACPI_DISPATCHER
-        MODULE_NAME         ("dswscope")
+        ACPI_MODULE_NAME    ("dswscope")
 
 
 #define STACK_POP(head) head
@@ -145,7 +145,7 @@ AcpiDsScopeStackClear (
 {
     ACPI_GENERIC_STATE      *ScopeInfo;
 
-    PROC_NAME ("DsScopeStackClear");
+    ACPI_FUNCTION_NAME ("DsScopeStackClear");
 
 
     while (WalkState->ScopeInfo)
@@ -177,20 +177,20 @@ AcpiDsScopeStackClear (
 ACPI_STATUS
 AcpiDsScopeStackPush (
     ACPI_NAMESPACE_NODE     *Node,
-    ACPI_OBJECT_TYPE8       Type,
+    ACPI_OBJECT_TYPE        Type,
     ACPI_WALK_STATE         *WalkState)
 {
     ACPI_GENERIC_STATE      *ScopeInfo;
 
 
-    FUNCTION_TRACE ("DsScopeStackPush");
+    ACPI_FUNCTION_TRACE ("DsScopeStackPush");
 
 
     if (!Node)
     {
         /* Invalid scope   */
 
-        REPORT_ERROR (("DsScopeStackPush: null scope passed\n"));
+        ACPI_REPORT_ERROR (("DsScopeStackPush: null scope passed\n"));
         return_ACPI_STATUS (AE_BAD_PARAMETER);
     }
 
@@ -198,7 +198,7 @@ AcpiDsScopeStackPush (
 
     if (!AcpiExValidateObjectType (Type))
     {
-        REPORT_WARNING (("DsScopeStackPush: type code out of range\n"));
+        ACPI_REPORT_WARNING (("DsScopeStackPush: type code out of range\n"));
     }
 
 
@@ -248,7 +248,7 @@ AcpiDsScopeStackPop (
     ACPI_GENERIC_STATE      *ScopeInfo;
 
 
-    FUNCTION_TRACE ("DsScopeStackPop");
+    ACPI_FUNCTION_TRACE ("DsScopeStackPop");
 
 
     /*