Date: Tue, 30 Jul 2002 12:35:32 -0700 (PDT) From: Mitsuru IWASAKI <iwasaki@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/conf files src/sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h acpiosxf.h acpixf.h acutils.h dbcmds.c dbdisasm.c dbfileio.c dbxface.c psparse.c rscreate.c tbget.c utglobal.c src/sys/dev/acpica acpi.c ... Message-ID: <200207301935.g6UJZWvZ047938@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
iwasaki 2002/07/30 12:35:32 PDT
Modified files:
sys/conf files
sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h
acpiosxf.h acpixf.h acutils.h dbcmds.c
dbfileio.c dbxface.c psparse.c
rscreate.c tbget.c utglobal.c
sys/dev/acpica acpi.c
sys/dev/acpica/Osd OsdTable.c
sys/modules/acpi Makefile
Added files:
sys/i386/include acpica_machdep.h
sys/ia64/include acpica_machdep.h
Removed files:
sys/contrib/dev/acpica dbdisasm.c
Log:
Resolve conflicts arising from the ACPI CA 20020725 import.
Revision Changes Path
1.677 +12 -2 src/sys/conf/files
1.20 +10 -1 src/sys/contrib/dev/acpica/acconfig.h
1.3 +11 -4 src/sys/contrib/dev/acpica/acenv.h
1.11 +1 -165 src/sys/contrib/dev/acpica/acfreebsd.h
1.10 +4 -4 src/sys/contrib/dev/acpica/acpiosxf.h
1.16 +4 -0 src/sys/contrib/dev/acpica/acpixf.h
1.3 +3 -1 src/sys/contrib/dev/acpica/acutils.h
1.2 +392 -117 src/sys/contrib/dev/acpica/dbcmds.c
1.4 +0 -867 src/sys/contrib/dev/acpica/dbdisasm.c (dead)
1.5 +15 -8 src/sys/contrib/dev/acpica/dbfileio.c
1.2 +187 -98 src/sys/contrib/dev/acpica/dbxface.c
1.17 +5 -2 src/sys/contrib/dev/acpica/psparse.c
1.5 +1 -3 src/sys/contrib/dev/acpica/rscreate.c
1.7 +239 -603 src/sys/contrib/dev/acpica/tbget.c
1.5 +38 -87 src/sys/contrib/dev/acpica/utglobal.c
1.2 +6 -1 src/sys/dev/acpica/Osd/OsdTable.c
1.67 +5 -0 src/sys/dev/acpica/acpi.c
1.1 +125 -0 src/sys/i386/include/acpica_machdep.h (new)
1.1 +115 -0 src/sys/ia64/include/acpica_machdep.h (new)
1.21 +26 -16 src/sys/modules/acpi/Makefile
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207301935.g6UJZWvZ047938>