thorpej
Sun May 19 17:20:51 PDT 1996
Update of /a/cvsroot/src/sys/dev
In directory pain.lcs.mit.edu:/a/tmp/cvs-serv12801

Revision/Branch: 1.1.1

Log Message:
Update to the Digital Equipment PDQ-based FDDI controllers, from
Matt Thomas.  Now includes support for EISA (DEFEA) and first-cut of
support for TurboChannel (DEFTA) cards.

Status:

Vendor Tag:	thomas
Release Tags:	thomas-pdq-960516
		
N src/sys/dev/eisa/if_fea.c
C src/sys/dev/ic/pdq.c
C src/sys/dev/ic/pdq_ifsubr.c
C src/sys/dev/ic/pdqreg.h
C src/sys/dev/ic/pdqvar.h
C src/sys/dev/pci/if_fpa.c
N src/sys/dev/tc/if_fta.c

5 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jthomas:yesterday -jthomas src/sys/dev


thorpej
Sun May 19 17:26:31 PDT 1996
Update of /a/cvsroot/src/sys/dev/ic
In directory pain.lcs.mit.edu:/a/tmp/cvs-serv13128

Modified Files:
	pdq.c pdq_ifsubr.c pdqreg.h pdqvar.h 
Log Message:
Fix conflicts during import.