From owner-cvs-sys Fri Jan 17 15:54:47 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id PAA06736 for cvs-sys-outgoing; Fri, 17 Jan 1997 15:54:47 -0800 (PST) Received: (from joerg@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id PAA06729; Fri, 17 Jan 1997 15:54:46 -0800 (PST) Date: Fri, 17 Jan 1997 15:54:46 -0800 (PST) From: Joerg Wunsch Message-Id: <199701172354.PAA06729@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-sys Subject: cvs commit: src/sys/conf files src/sys/dev/pdq pdq.c pdq_ifsubr.c src/sys/net if_fddisubr.c src/sys/pci if_fpa.c if_pdq.c pdq.c pdq_os.h pdqreg.h src/sys/i386/conf files.i386 src/sys/i386/eisa if_fea.c src/sys/netinet if_fddi.h Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk joerg 97/01/17 15:54:45 Modified: sys/conf files sys/dev/pdq pdq.c pdq_ifsubr.c sys/i386/conf files.i386 sys/i386/eisa if_fea.c sys/net if_fddisubr.c sys/netinet if_fddi.h sys/pci if_fpa.c Removed: sys/pci if_pdq.c pdq.c pdq_os.h pdqreg.h Log: This mega-merge brings Matt Thomas' 960801 FDDI driver (almost) up to -current. Thanks goes to Ulrike Nitzsche for giving me a chance to test this. Only the PCI driver is tested though. One final patch will follow in a separate commit. This is so that everything up to here can be dragged into 2.2, if we decide so. Reviewed by: joerg Submitted by: Matt Thomas Revision Changes Path 1.85 +5 -4 src/sys/conf/files 1.2 +6 -1 src/sys/dev/pdq/pdq.c 1.2 +7 -4 src/sys/dev/pdq/pdq_ifsubr.c 1.151 +1 -0 src/sys/i386/conf/files.i386 1.2 +10 -25 src/sys/i386/eisa/if_fea.c 1.13 +187 -52 src/sys/net/if_fddisubr.c 1.5 +6 -2 src/sys/netinet/if_fddi.h 1.2 +11 -12 src/sys/pci/if_fpa.c