From owner-cvs-all  Fri Apr 20 22:52:37 2001
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 4E5C237B423; Fri, 20 Apr 2001 22:52:31 -0700 (PDT)
	(envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f3L5qVr69577;
	Fri, 20 Apr 2001 22:52:31 -0700 (PDT)
	(envelope-from imp)
Message-Id: <200104210552.f3L5qVr69577@freefall.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 20 Apr 2001 22:52:31 -0700 (PDT)
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
X-FreeBSD-CVS-Branch: RELENG_4
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

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