Date: Fri, 20 Apr 2001 22:52:31 -0700 (PDT) From: Warner Losh <imp@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/pccard cardinfo.h driver.h i82365.h pccard.c pccard_nbk.c pcic.c pcic98reg.h slot.h Message-ID: <200104210552.f3L5qVr69577@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
imp 2001/04/20 22:52:31 PDT
Modified files: (Branch: RELENG_4)
sys/pccard cardinfo.h driver.h i82365.h pccard.c
pccard_nbk.c pcic.c pcic98reg.h slot.h
Log:
Catch up with current aka MFC
cardinfo.h -> 1.20
driver.h -> 1.14
i82365.h -> 1.12
pccard.c -> 1.119
pccard_nbk.h -> 1.26
pcic.c -> 1.108
pcic98reg.h -> 1.3
slot.h -> 1.29
Some items not merged. Those are marked with NOT_YET_XXX. These will be
merged in the fullness of time. See the commit logs in -current for the
details.
# this may cause some people some problems, which is why I waited until
# after 4.3 was branched. Please report problems to me.
Revision Changes Path
1.16.2.3 +3 -2 src/sys/pccard/cardinfo.h
1.12.2.2 +7 -7 src/sys/pccard/driver.h
1.10.2.1 +61 -18 src/sys/pccard/i82365.h
1.106.2.5 +80 -84 src/sys/pccard/pccard.c
1.15.2.4 +61 -4 src/sys/pccard/pccard_nbk.c
1.89.2.6 +431 -117 src/sys/pccard/pcic.c
1.1.10.2 +34 -22 src/sys/pccard/pcic98reg.h
1.25.2.1 +10 -10 src/sys/pccard/slot.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?200104210552.f3L5qVr69577>