Date: Sun, 30 Jun 2002 10:53:12 -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 acfreebsd.h acgcc.h acpiosxf.h acpixf.h dbfileio.c exfldio.c hwsleep.c psparse.c tbget.c utglobal.c src/sys/dev/acpica acpica_support.c src/sys/i386/acpica OsdEnvironment.c src/sys/ia64/acpica ... Message-ID: <200206301753.g5UHrCIZ001941@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
iwasaki 2002/06/30 10:53:12 PDT
Modified files:
sys/contrib/dev/acpica acconfig.h acfreebsd.h acgcc.h
acpiosxf.h acpixf.h dbfileio.c
exfldio.c hwsleep.c psparse.c tbget.c
utglobal.c
sys/dev/acpica acpica_support.c
sys/i386/acpica OsdEnvironment.c
sys/ia64/acpica OsdEnvironment.c
Log:
Resolve conflicts arising from the ACPI CA 20020404 import.
Revision Changes Path
1.18 +1 -1 src/sys/contrib/dev/acpica/acconfig.h
1.9 +6 -0 src/sys/contrib/dev/acpica/acfreebsd.h
1.16 +8 -9 src/sys/contrib/dev/acpica/acgcc.h
1.9 +11 -1 src/sys/contrib/dev/acpica/acpiosxf.h
1.14 +1 -1 src/sys/contrib/dev/acpica/acpixf.h
1.3 +34 -17 src/sys/contrib/dev/acpica/dbfileio.c
1.11 +5 -5 src/sys/contrib/dev/acpica/exfldio.c
1.5 +1 -0 src/sys/contrib/dev/acpica/hwsleep.c
1.15 +75 -29 src/sys/contrib/dev/acpica/psparse.c
1.5 +132 -167 src/sys/contrib/dev/acpica/tbget.c
1.3 +35 -21 src/sys/contrib/dev/acpica/utglobal.c
1.5 +3 -5 src/sys/dev/acpica/acpica_support.c
1.4 +2 -2 src/sys/i386/acpica/OsdEnvironment.c
1.3 +10 -5 src/sys/ia64/acpica/OsdEnvironment.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?200206301753.g5UHrCIZ001941>