summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/include/acutils.h
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2015-08-26 17:13:47 +0000
committerjkim <jkim@FreeBSD.org>2015-08-26 17:13:47 +0000
commit0481c185aa535c3b0d54c15bbfaf408653682053 (patch)
tree0606377d19dcae0dce18140bbb6fc7ec7c38dc92 /sys/contrib/dev/acpica/include/acutils.h
parentad5ab1890bfe6dfda770f906a5cc088c52fa6b0c (diff)
downloadFreeBSD-src-0481c185aa535c3b0d54c15bbfaf408653682053.zip
FreeBSD-src-0481c185aa535c3b0d54c15bbfaf408653682053.tar.gz
Merge ACPICA 20150818.
Diffstat (limited to 'sys/contrib/dev/acpica/include/acutils.h')
-rw-r--r--sys/contrib/dev/acpica/include/acutils.h11
1 files changed, 1 insertions, 10 deletions
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
OpenPOWER on IntegriCloud