summaryrefslogtreecommitdiffstats
path: root/usr.sbin/acpi
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2015-05-18 23:46:11 +0000
committerjkim <jkim@FreeBSD.org>2015-05-18 23:46:11 +0000
commitfcf0fbf9ed4820d5be560952f5a24594b0a63a67 (patch)
treee88c112446963b036bdd2b1d402ebf1f8bf9bc10 /usr.sbin/acpi
parentaf288ae5ce3e6f865488a2e09e8b3480e5247a74 (diff)
parent10842bd3d05a791e4f526aa9c904791bb26615e4 (diff)
downloadFreeBSD-src-fcf0fbf9ed4820d5be560952f5a24594b0a63a67.zip
FreeBSD-src-fcf0fbf9ed4820d5be560952f5a24594b0a63a67.tar.gz
Merge ACPICA 20150515.
Diffstat (limited to 'usr.sbin/acpi')
-rw-r--r--usr.sbin/acpi/acpidb/acpidb.c2
-rw-r--r--usr.sbin/acpi/iasl/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index f49420f..b3d0021 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -478,7 +478,7 @@ load_dsdt(const char *dsdtfile)
return (-1);
}
- AcpiDbGetTableFromFile(filetmp, NULL);
+ AcpiDbGetTableFromFile(filetmp, NULL, TRUE);
AcpiDbInitialize();
AcpiGbl_DebuggerConfiguration = 0;
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 7f6a1bd..e9faad2 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -4,8 +4,8 @@ PROG= iasl
# common
SRCS= adfile.c adisasm.c adwalk.c ahids.c ahpredef.c \
- ahuuids.c cmfsize.c dmextern.c dmrestag.c dmtable.c \
- dmtbdump.c dmtbinfo.c getopt.c
+ ahtable.c ahuuids.c cmfsize.c dmextern.c dmrestag.c \
+ dmtable.c dmtbdump.c dmtbinfo.c getopt.c
# compiler
SRCS+= aslanalyze.c aslascii.c aslbtypes.c aslcodegen.c \
OpenPOWER on IntegriCloud