From owner-cvs-all  Thu Jul 19  6:16:59 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 971CF37B401; Thu, 19 Jul 2001 06:16:54 -0700 (PDT)
	(envelope-from joerg@FreeBSD.org)
Received: (from joerg@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f6JDGsb08411;
	Thu, 19 Jul 2001 06:16:54 -0700 (PDT)
	(envelope-from joerg)
Message-Id: <200107191316.f6JDGsb08411@freefall.freebsd.org>
From: Joerg Wunsch <joerg@FreeBSD.org>
Date: Thu, 19 Jul 2001 06:16:54 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/alpha/include ioctl_fd.h src/sys/i386/include
         ioctl_fd.h src/sys/isa fd.c
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

joerg       2001/07/19 06:16:54 PDT

  Modified files:        (Branch: RELENG_4)
    sys/alpha/include    ioctl_fd.h 
    sys/i386/include     ioctl_fd.h 
    sys/isa              fd.c 
  Log:
  Merge a small part of the floppy driver changes from -current into
  RELENG_4.  FDOPT_NOERRLOG and the FD_GSTAT ioctl command are merged,
  both are fairly minor changes that are easily auditable and thus
  copmatible with the policy of -stable.
  
  Revision   Changes    Path
  1.3.2.1    +15 -3     src/sys/alpha/include/Attic/ioctl_fd.h
  1.13.2.1   +15 -3     src/sys/i386/include/Attic/ioctl_fd.h
  1.176.2.2  +29 -15    src/sys/isa/fd.c


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