Module Name:	syssrc
Committed By:	wiz
Date:		Sat Jul  1 01:30:45 UTC 2000

Update of /cvsroot/syssrc/sys/dev/pci/bktr
In directory nb00:/tmp/cvs-serv23853

Log Message:
Import release 2.14 of the bktr driver. Changes: mostly integration
of NetBSD changes; support for new Hauppauge tuner types.


Vendor Tag:	FREEBSD
Release Tags:	BKTR-2_14
		
C syssrc/sys/dev/pci/bktr/bktr_audio.c
U syssrc/sys/dev/pci/bktr/bktr_audio.h
C syssrc/sys/dev/pci/bktr/bktr_card.c
C syssrc/sys/dev/pci/bktr/bktr_card.h
C syssrc/sys/dev/pci/bktr/bktr_core.c
C syssrc/sys/dev/pci/bktr/bktr_core.h
C syssrc/sys/dev/pci/bktr/bktr_os.c
U syssrc/sys/dev/pci/bktr/bktr_os.h
C syssrc/sys/dev/pci/bktr/bktr_reg.h
C syssrc/sys/dev/pci/bktr/bktr_tuner.c
U syssrc/sys/dev/pci/bktr/bktr_tuner.h

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

	cvs checkout -jFREEBSD:yesterday -jFREEBSD syssrc/sys/dev/pci/bktr