Vendor import of the Intel ACPI CA 20020815 drop.

1 files changed, 6 insertions, 8 deletions

diff --git a/sys/contrib/dev/acpica/dbcmds.c b/sys/contrib/dev/acpica/dbcmds.c
index 49927874dad7..d8c2d3ed05a1 100644
--- a/sys/contrib/dev/acpica/dbcmds.c
+++ b/sys/contrib/dev/acpica/dbcmds.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dbcmds - debug commands and output routines
- *              $Revision: 85 $
+ *              $Revision: 87 $
  *
  ******************************************************************************/
 
@@ -124,9 +124,9 @@
 #include "acresrc.h"
 #include "acdisasm.h"
 
-#ifdef ENABLE_DEBUGGER
+#ifdef ACPI_DEBUGGER
 
-#define _COMPONENT          ACPI_DEBUGGER
+#define _COMPONENT          ACPI_CA_DEBUGGER
         ACPI_MODULE_NAME    ("dbcmds")
 
 
@@ -859,7 +859,7 @@ AcpiDbDisplayObjects (
     }
 
     AcpiDbSetOutputDestination (ACPI_DB_DUPLICATE_OUTPUT);
-    AcpiOsPrintf ("Objects of type [%s] defined in the current ACPI Namespace: \n", 
+    AcpiOsPrintf ("Objects of type [%s] defined in the current ACPI Namespace: \n",
         AcpiUtGetTypeName (Type));
 
     AcpiDbSetOutputDestination (ACPI_DB_REDIRECTABLE_OUTPUT);
@@ -1175,9 +1175,7 @@ Cleanup:
 }
 
 
-
-
-typedef struct 
+typedef struct
 {
     UINT32              Nodes;
     UINT32              Objects;
@@ -1267,4 +1265,4 @@ AcpiDbCheckIntegrity (void)
 
 }
 
-#endif /* ENABLE_DEBUGGER */
+#endif /* ACPI_DEBUGGER */