From owner-cvs-sys  Mon Apr 28 12:33:59 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id MAA03420
          for cvs-sys-outgoing; Mon, 28 Apr 1997 12:33:59 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id MAA03392;
          Mon, 28 Apr 1997 12:33:44 -0700 (PDT)
From: Stefan Esser <se@freefall.FreeBSD.ORG>
Received: (from se@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id MAA13091;
	Mon, 28 Apr 1997 12:33:21 -0700 (PDT)
Date: Mon, 28 Apr 1997 12:33:21 -0700 (PDT)
Message-Id: <199704281933.MAA13091@freefall.freebsd.org>
To: CVS-committers@FreeBSD.org, cvs-all@FreeBSD.org, cvs-sys@FreeBSD.org
Subject: cvs commit:  src/sys/i386/conf options.i386 src/sys/i386/isa wd.c src/sys/pci wdc_p.c
Sender: owner-cvs-sys@FreeBSD.org
X-Loop: FreeBSD.org
Precedence: bulk

se          97/04/28 12:33:21

  Branch:      sys/i386/isa  RELENG_2_2
               sys/i386/conf  RELENG_2_2
               sys/pci   RELENG_2_2
  Modified:    sys/i386/isa  wd.c
               sys/i386/conf  options.i386
               sys/pci   wdc_p.c
  Log:
  Merge in from -current: Put #define of CMD640 option into opt_wd.h
  
  Revision  Changes    Path
  1.119.2.5 +2 -1      src/sys/i386/isa/wd.c
  1.26.2.8  +3 -1      src/sys/i386/conf/options.i386
  1.1.2.1   +2 -1      src/sys/pci/wdc_p.c