From 2d4c34274d3da54743236aaf41ec8060f17035b8 Mon Sep 17 00:00:00 2001
From: Nate Lawson <njl@FreeBSD.org>
Date: Tue, 9 Dec 2003 03:00:55 +0000
Subject: [PATCH] Unchanged files that are off the vendor branch.

---
 sys/contrib/dev/acpica/acconfig.h |  4 ++--
 sys/contrib/dev/acpica/acenv.h    |  8 +++++---
 sys/contrib/dev/acpica/acutils.h  | 10 +++++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sys/contrib/dev/acpica/acconfig.h b/sys/contrib/dev/acpica/acconfig.h
index bba73c621c5..47ea169288d 100644
--- a/sys/contrib/dev/acpica/acconfig.h
+++ b/sys/contrib/dev/acpica/acconfig.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acconfig.h - Global configuration constants
- *       $Revision: 139 $
+ *       $Revision: 145 $
  *
  *****************************************************************************/
 
@@ -137,7 +137,7 @@
 
 /* Version string */
 
-#define ACPI_CA_VERSION                 0x20030619
+#define ACPI_CA_VERSION                 0x20031203
 
 /* Maximum objects in the various object caches */
 
diff --git a/sys/contrib/dev/acpica/acenv.h b/sys/contrib/dev/acpica/acenv.h
index 5cc9376c8f6..6352e3a6795 100644
--- a/sys/contrib/dev/acpica/acenv.h
+++ b/sys/contrib/dev/acpica/acenv.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acenv.h - Generation environment specific items
- *       $Revision: 104 $
+ *       $Revision: 105 $
  *
  *****************************************************************************/
 
@@ -207,6 +207,9 @@
 #elif defined(__FreeBSD__)
 #include "acfreebsd.h"
 
+#elif defined(__NetBSD__)
+#include "acnetbsd.h"
+
 #elif defined(MODESTO)
 #include "acmodesto.h"
 
@@ -267,8 +270,7 @@
 #else
 #define DEBUGGER_THREADING          DEBUGGER_MULTI_THREADED
 #endif
-#endif
-
+#endif /* !DEBUGGER_THREADING */
 
 /******************************************************************************
  *
diff --git a/sys/contrib/dev/acpica/acutils.h b/sys/contrib/dev/acpica/acutils.h
index ca520245359..db94284534f 100644
--- a/sys/contrib/dev/acpica/acutils.h
+++ b/sys/contrib/dev/acpica/acutils.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
- *       $Revision: 155 $
+ *       $Revision: 157 $
  *
  *****************************************************************************/
 
@@ -198,6 +198,14 @@ char *
 AcpiUtGetTypeName (
     ACPI_OBJECT_TYPE        Type);
 
+char *
+AcpiUtGetNodeName (
+    void                    *Object);
+
+char *
+AcpiUtGetDescriptorName (
+    void                    *Object);
+
 char *
 AcpiUtGetObjectTypeName (
     ACPI_OPERAND_OBJECT     *ObjDesc);