summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2007-03-22 18:16:43 +0000
committerjkim <jkim@FreeBSD.org>2007-03-22 18:16:43 +0000
commitc06098a4065d7be63bd57c45889a91da9bc0f5e4 (patch)
treecdaa579af45ece33bafe9e4fe4c9aef8bd85ed29 /sys/conf
parent07ec417491720a77d28b1083886826f0141b171c (diff)
downloadFreeBSD-src-c06098a4065d7be63bd57c45889a91da9bc0f5e4.zip
FreeBSD-src-c06098a4065d7be63bd57c45889a91da9bc0f5e4.tar.gz
Catch up with ACPI-CA 20070320 import.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files10
-rw-r--r--sys/conf/options1
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/conf/files b/sys/conf/files
index d20a0eb..3f9ccb9 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -226,17 +226,14 @@ contrib/dev/acpica/rsmemory.c optional acpi
contrib/dev/acpica/rsmisc.c optional acpi
contrib/dev/acpica/rsutils.c optional acpi
contrib/dev/acpica/rsxface.c optional acpi
-contrib/dev/acpica/tbconvrt.c optional acpi
-contrib/dev/acpica/tbget.c optional acpi
-contrib/dev/acpica/tbgetall.c optional acpi
+contrib/dev/acpica/tbfadt.c optional acpi
+contrib/dev/acpica/tbfind.c optional acpi
contrib/dev/acpica/tbinstal.c optional acpi
-contrib/dev/acpica/tbrsdt.c optional acpi
contrib/dev/acpica/tbutils.c optional acpi
contrib/dev/acpica/tbxface.c optional acpi
contrib/dev/acpica/tbxfroot.c optional acpi
contrib/dev/acpica/utalloc.c optional acpi
-contrib/dev/acpica/utcache.c optional acpi \
- compile-with "${NORMAL_C} -DACPI_USE_LOCAL_CACHE"
+contrib/dev/acpica/utcache.c optional acpi
contrib/dev/acpica/utclib.c optional acpi
contrib/dev/acpica/utcopy.c optional acpi
contrib/dev/acpica/utdebug.c optional acpi
@@ -248,6 +245,7 @@ contrib/dev/acpica/utmath.c optional acpi
contrib/dev/acpica/utmisc.c optional acpi
contrib/dev/acpica/utmutex.c optional acpi
contrib/dev/acpica/utobject.c optional acpi
+contrib/dev/acpica/utresrc.c optional acpi
contrib/dev/acpica/utstate.c optional acpi
contrib/dev/acpica/utxface.c optional acpi
contrib/ipfilter/netinet/fil.c optional ipfilter inet \
diff --git a/sys/conf/options b/sys/conf/options
index 0496857..389e16c 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -649,7 +649,6 @@ WITNESS_SKIPSPIN opt_witness.h
ACPI_DEBUG opt_acpi.h
ACPI_MAX_THREADS opt_acpi.h
ACPI_NO_SEMAPHORES opt_acpi.h
-ACPICA_PEDANTIC opt_acpi.h
# ISA support
DEV_ISA opt_isa.h
OpenPOWER on IntegriCloud