thorpej
Sun Mar 16 19:41:28 PST 1997
Update of /cvsroot/src/sys/dev
In directory netbsd1:/var/slash-tmp/cvs-serv1040

Log Message:
New DEC Tulip driver from Matt Thomas <matt@3am-software.com>.
Highligts:
	- Supports media selection via if_media
	- Support for Asante and better support for ZNYX boards
	- Support for 21143 chips (such as found on the DE500-BA)
	- Should be able to pick the BNC on the on-board 21040-based
	  interface in DEC Multias.
	- Squish a bug here and there.

Status:

Vendor Tag:	thomas
Release Tags:	de-970313a
		
C src/sys/dev/ic/dc21040reg.h
C src/sys/dev/pci/if_de.c
C src/sys/dev/pci/if_devar.h

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

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


thorpej
Sun Mar 16 19:44:52 PST 1997
Update of /cvsroot/src/sys/dev/pci
In directory netbsd1:/var/slash-tmp/cvs-serv2413

Modified Files:
	if_de.c if_devar.h 
Log Message:
Resolve conflicts from merge.


thorpej
Sun Mar 16 19:46:13 PST 1997
Update of /cvsroot/src/sys/dev/ic
In directory netbsd1:/var/slash-tmp/cvs-serv2471

Modified Files:
	dc21040reg.h 
Log Message:
Resolve conflicts from merge.