Date: Wed, 28 Aug 2002 18:52:27 -0700 (PDT) From: Mitsuru IWASAKI <iwasaki@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h acgcc.h acpiosxf.h acutils.h dbcmds.c dbfileio.c dbxface.c exfldio.c exsystem.c hwsleep.c psparse.c rscreate.c tbget.c utglobal.c src/sys/dev/acpica acpi.c acpivar.h ... Message-ID: <200208290152.g7T1qRBd042424@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
iwasaki 2002/08/28 18:52:27 PDT
Modified files:
sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h acgcc.h
acpiosxf.h acutils.h dbcmds.c
dbfileio.c dbxface.c exfldio.c
exsystem.c hwsleep.c psparse.c
rscreate.c tbget.c utglobal.c
sys/dev/acpica acpi.c acpivar.h
sys/dev/acpica/Osd OsdDebug.c
Log:
Resolve conflicts arising from the ACPI CA 20020815 import.
Revision Changes Path
1.21 +3 -3 src/sys/contrib/dev/acpica/acconfig.h
1.4 +7 -7 src/sys/contrib/dev/acpica/acenv.h
1.12 +8 -4 src/sys/contrib/dev/acpica/acfreebsd.h
1.18 +1 -1 src/sys/contrib/dev/acpica/acgcc.h
1.11 +2 -2 src/sys/contrib/dev/acpica/acpiosxf.h
1.4 +3 -3 src/sys/contrib/dev/acpica/acutils.h
1.3 +6 -8 src/sys/contrib/dev/acpica/dbcmds.c
1.6 +5 -5 src/sys/contrib/dev/acpica/dbfileio.c
1.3 +7 -7 src/sys/contrib/dev/acpica/dbxface.c
1.13 +2 -2 src/sys/contrib/dev/acpica/exfldio.c
1.5 +1 -1 src/sys/contrib/dev/acpica/exsystem.c
1.7 +6 -6 src/sys/contrib/dev/acpica/hwsleep.c
1.18 +71 -83 src/sys/contrib/dev/acpica/psparse.c
1.6 +1 -1 src/sys/contrib/dev/acpica/rscreate.c
1.8 +16 -16 src/sys/contrib/dev/acpica/tbget.c
1.6 +8 -5 src/sys/contrib/dev/acpica/utglobal.c
1.4 +1 -1 src/sys/dev/acpica/Osd/OsdDebug.c
1.71 +29 -16 src/sys/dev/acpica/acpi.c
1.34 +1 -1 src/sys/dev/acpica/acpivar.h
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?200208290152.g7T1qRBd042424>