Date: Fri, 22 Feb 2002 21:16:35 -0800 (PST) From: Mike Smith <msmith@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/dev/acpica acconfig.h acfreebsd.h acgcc.h acpi.h acpiosxf.h acpixf.h exfldio.c exsystem.c hwsleep.c psparse.c rscreate.c tbget.c Message-ID: <200202230516.g1N5GZh92581@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
msmith 2002/02/22 21:16:35 PST
Modified files:
sys/contrib/dev/acpica acconfig.h acfreebsd.h acgcc.h acpi.h
acpiosxf.h acpixf.h exfldio.c
exsystem.c hwsleep.c psparse.c
rscreate.c tbget.c
Log:
Resolve conflicts arising from the ACPI CA 20020217 import.
Revision Changes Path
1.16 +42 -17 src/sys/contrib/dev/acpica/acconfig.h
1.8 +2 -2 src/sys/contrib/dev/acpica/acfreebsd.h
1.13 +6 -6 src/sys/contrib/dev/acpica/acgcc.h
1.3 +2 -2 src/sys/contrib/dev/acpica/acpi.h
1.7 +6 -10 src/sys/contrib/dev/acpica/acpiosxf.h
1.13 +4 -3 src/sys/contrib/dev/acpica/acpixf.h
1.10 +77 -60 src/sys/contrib/dev/acpica/exfldio.c
1.3 +27 -19 src/sys/contrib/dev/acpica/exsystem.c
1.4 +100 -86 src/sys/contrib/dev/acpica/hwsleep.c
1.14 +200 -146 src/sys/contrib/dev/acpica/psparse.c
1.3 +74 -97 src/sys/contrib/dev/acpica/rscreate.c
1.4 +46 -65 src/sys/contrib/dev/acpica/tbget.c
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?200202230516.g1N5GZh92581>