From owner-cvs-src@FreeBSD.ORG  Sat Sep 18 04:57:55 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id DBD7916A4CE; Sat, 18 Sep 2004 04:57:55 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id CF9DE43D1F; Sat, 18 Sep 2004 04:57:55 +0000 (GMT)
	(envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8I4vtR2015625;
	Sat, 18 Sep 2004 04:57:55 GMT
	(envelope-from imp@repoman.freebsd.org)
Received: (from imp@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8I4vtlh015624;
	Sat, 18 Sep 2004 04:57:55 GMT
	(envelope-from imp)
Message-Id: <200409180457.i8I4vtlh015624@repoman.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 18 Sep 2004 04:57:55 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Subject: cvs commit: src/sys/sys fdcio.h src/sys/dev/fdc fdc.c fdc_acpi.c
 fdc_isa.c fdc_pccard.c fdcreg.h fdcvar.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Sep 2004 04:57:56 -0000

imp         2004-09-18 04:57:55 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/sys              fdcio.h 
    sys/dev/fdc          fdc.c fdc_acpi.c fdc_isa.c fdc_pccard.c 
                         fdcvar.h 
  Removed files:         (Branch: RELENG_5)
    sys/dev/fdc          fdcreg.h 
  Log:
  MFC: Merge in phk's new floppy driver.
  
  Approved by: re@
  
  Revision   Changes      Path
  1.283.2.1  +1480 -1849  src/sys/dev/fdc/fdc.c
  1.2.2.2    +53 -69      src/sys/dev/fdc/fdc_acpi.c
  1.9.2.2    +67 -131     src/sys/dev/fdc/fdc_isa.c
  1.8.2.1    +17 -20      src/sys/dev/fdc/fdc_pccard.c
  1.18.2.1   +0 -67       src/sys/dev/fdc/fdcreg.h (dead)
  1.3.2.1    +14 -67      src/sys/dev/fdc/fdcvar.h
  1.17.8.1   +64 -32      src/sys/sys/fdcio.h