From owner-cvs-sys  Sun Oct  5 14:01:33 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id OAA09103
          for cvs-sys-outgoing; Sun, 5 Oct 1997 14:01:33 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id OAA09018;
          Sun, 5 Oct 1997 14:00:53 -0700 (PDT)
From: Joerg Wunsch <joerg@FreeBSD.ORG>
Received: (from joerg@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id OAA02566;
	Sun, 5 Oct 1997 14:00:37 -0700 (PDT)
Date: Sun, 5 Oct 1997 14:00:37 -0700 (PDT)
Message-Id: <199710052100.OAA02566@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG
Subject: cvs commit: src/sys/i386/conf LINT options.i386 src/sys/i386/isa
         fd.c fdc.h src/sys/i386/isa/ic nec765.h
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

joerg       1997/10/05 14:00:37 PDT

  Modified files:        (Branch: RELENG_2_2)
    sys/i386/conf        LINT options.i386 
    sys/i386/isa         fd.c fdc.h 
    sys/i386/isa/ic      nec765.h 
  Log:
  Merge the fixes from rev 1.101 and 1.102 of fd.c, plus the required
  environment:
  
  . hide the bogus chip type announcement behind an option,
  . make FDC_DEBUG a supported option,
  . enable the FIFO on `enhanced' controllers, to work around known bugs
    in some FDC chips.
  
  Revision  Changes    Path
  1.286.2.28 +8 -1      src/sys/i386/conf/LINT
  1.26.2.11 +4 -1      src/sys/i386/conf/options.i386
  1.92.2.4  +76 -10    src/sys/i386/isa/fd.c
  1.6.2.1   +2 -1      src/sys/i386/isa/fdc.h
  1.4.8.1   +2 -1      src/sys/i386/isa/ic/nec765.h