summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2011-11-28 23:36:48 +0000
committerjkim <jkim@FreeBSD.org>2011-11-28 23:36:48 +0000
commit1bdf3ee8a88f36389b6ebd626dc91b14c9674b9d (patch)
tree9ddf54564f2132efa4b2bc210ee8f94df85b4d86 /sys/modules
parent7cc588c10b92dcba82aa8dd93162b1a9d4e5f342 (diff)
parent371a323d3dee8126616c1fdb31a8319c8718310f (diff)
downloadFreeBSD-src-1bdf3ee8a88f36389b6ebd626dc91b14c9674b9d.zip
FreeBSD-src-1bdf3ee8a88f36389b6ebd626dc91b14c9674b9d.tar.gz
Merge ACPICA 20111123.
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/acpi/acpi/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile
index 1cbb9a6..43cb989 100644
--- a/sys/modules/acpi/acpi/Makefile
+++ b/sys/modules/acpi/acpi/Makefile
@@ -35,7 +35,7 @@ KMOD= acpi
SRCS+= dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c dbinput.c dbmethod.c
SRCS+= dbnames.c dbstats.c dbutils.c dbxface.c
SRCS+= dmbuffer.c dmnames.c dmopcode.c dmobject.c dmresrc.c dmresrcl.c
-SRCS+= dmresrcs.c dmutils.c dmwalk.c
+SRCS+= dmresrcl2.c dmresrcs.c dmutils.c dmwalk.c
SRCS+= dsargs.c dscontrol.c dsfield.c dsinit.c dsmethod.c dsmthdat.c
SRCS+= dsobject.c dsopcode.c dsutils.c dswexec.c dswload.c dswload2.c
SRCS+= dswscope.c dswstate.c
@@ -53,11 +53,12 @@ SRCS+= nsutils.c nswalk.c nsxfeval.c nsxfname.c nsxfobj.c
SRCS+= psargs.c psloop.c psopcode.c psparse.c psscope.c pstree.c psutils.c
SRCS+= pswalk.c psxface.c
SRCS+= rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c rsio.c rsirq.c rslist.c
-SRCS+= rsmemory.c rsmisc.c rsutils.c rsxface.c
+SRCS+= rsmemory.c rsmisc.c rsserial.c rsutils.c rsxface.c
SRCS+= tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c tbxfroot.c
SRCS+= utalloc.c utcache.c utcopy.c utdebug.c utdecode.c utdelete.c uteval.c
SRCS+= utglobal.c utids.c utinit.c utlock.c utmath.c utmisc.c utmutex.c
SRCS+= utobject.c utosi.c utresrc.c utstate.c utxface.c utxferror.c
+#SRCS+= utxfmutex.c
# OSPM layer and core hardware drivers
SRCS+= acpi.c acpi_button.c acpi_isab.c acpi_package.c acpi_pci.c acpi_pcib.c
OpenPOWER on IntegriCloud