From 0481c185aa535c3b0d54c15bbfaf408653682053 Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Wed, 26 Aug 2015 17:13:47 +0000
Subject: Merge ACPICA 20150818.

---
 sys/contrib/dev/acpica/include/acutils.h | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'sys/contrib/dev/acpica/include/acutils.h')

diff --git a/sys/contrib/dev/acpica/include/acutils.h b/sys/contrib/dev/acpica/include/acutils.h
index a2bcf2f..1cbaf6a 100644
--- a/sys/contrib/dev/acpica/include/acutils.h
+++ b/sys/contrib/dev/acpica/include/acutils.h
@@ -742,7 +742,7 @@ BOOLEAN
 AcpiUtIsPciRootBridge (
     char                    *Id);
 
-#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP)
+#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP || defined ACPI_NAMES_APP)
 BOOLEAN
 AcpiUtIsAmlTable (
     ACPI_TABLE_HEADER       *Table);
@@ -867,15 +867,6 @@ AcpiUtSafeStrcat (
     char                    *Dest,
     ACPI_SIZE               DestSize,
     char                    *Source);
-
-#ifndef _KERNEL
-BOOLEAN
-AcpiUtSafeStrncat (
-    char                    *Dest,
-    ACPI_SIZE               DestSize,
-    char                    *Source,
-    ACPI_SIZE               MaxTransferLength);
-#endif
 #endif
 
 
-- 
cgit v1.1