From owner-cvs-all  Thu Jul 19 15:36:26 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 E664B37B406; Thu, 19 Jul 2001 15:36:17 -0700 (PDT)
	(envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f6JMaHn29411;
	Thu, 19 Jul 2001 15:36:17 -0700 (PDT)
	(envelope-from imp)
Message-Id: <200107192236.f6JMaHn29411@freefall.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 19 Jul 2001 15:36:17 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/pccard pcic_pci.h
X-FreeBSD-CVS-Branch: RELENG_4
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

imp         2001/07/19 15:36:17 PDT

  Modified files:        (Branch: RELENG_4)
    sys/pccard           pcic_pci.h 
  Log:
  MFC: Merge the non-conflicting cardbus register defines from current.
  
  Revision  Changes    Path
  1.23.2.4  +34 -1     src/sys/pccard/pcic_pci.h


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message