1 files changed, 3 insertions, 57 deletions
diff --git a/sys/contrib/dev/acpica/dmnames.c b/sys/contrib/dev/acpica/dmnames.c
index b773c91..18e3614 100644
--- a/sys/contrib/dev/acpica/dmnames.c
+++ b/sys/contrib/dev/acpica/dmnames.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dmnames - AML disassembler, names, namestrings, pathnames
- *              $Revision: 2 $
+ *              $Revision: 3 $
  *
  ******************************************************************************/
 
@@ -124,7 +124,7 @@
 
 #ifdef ACPI_DISASSEMBLER
 
-#define _COMPONENT          ACPI_DEBUGGER
+#define _COMPONENT          ACPI_CA_DEBUGGER
         ACPI_MODULE_NAME    ("dmnames")
 
 
@@ -145,7 +145,7 @@ AcpiDmValidateName (
     char                    *Name,
     ACPI_PARSE_OBJECT       *Op)
 {
-#ifdef PARSER_ONLY
+#if 0
     ACPI_PARSE_OBJECT       *TargetOp;
 
 
@@ -226,58 +226,6 @@ AcpiDmDumpName (
  *
  ******************************************************************************/
 
-#ifdef PARSER_ONLY
-
-ACPI_STATUS
-AcpiPsDisplayObjectPathname (
-    ACPI_WALK_STATE         *WalkState,
-    ACPI_PARSE_OBJECT       *Op)
-{
-    ACPI_PARSE_OBJECT       *TargetOp;
-    char                    *Name;
-
-
-    if (Op->Common.Flags & ACPI_PARSEOP_GENERIC)
-    {
-        Name = Op->Common.Value.Name;
-        if (Name[0] == '\\')
-        {
-            AcpiOsPrintf ("  (Fully Qualified Pathname)");
-            return (AE_OK);
-        }
-    }
-    else
-    {
-        Name = (char *) &Op->Named.Name;
-    }
-
-    /* Search parent tree up to the root if necessary */
-
-    TargetOp = AcpiPsFind (Op, Name, 0, 0);
-    if (!TargetOp)
-    {
-        /*
-         * Didn't find the name in the parse tree.  This may be
-         * a problem, or it may simply be one of the predefined names
-         * (such as _OS_).  Rather than worry about looking up all
-         * the predefined names, just display the name as given
-         */
-        AcpiOsPrintf ("  **** Path not found in parse tree");
-    }
-    else
-    {
-        /* The target was found, print the name and complete path */
-
-        AcpiOsPrintf ("  (Path ");
-        AcpiDmDisplayPath (TargetOp);
-        AcpiOsPrintf (")");
-    }
-
-    return (AE_OK);
-}
-
-#else
-
 ACPI_STATUS
 AcpiPsDisplayObjectPathname (
     ACPI_WALK_STATE         *WalkState,
@@ -341,8 +289,6 @@ Exit:
     return (Status);
 }
 
-#endif
-
 
 /*******************************************************************************
  *