Module Name:	syssrc
Committed By:	wiz
Date:		Sat Jul  1 01:39:03 UTC 2000

Modified Files:
	syssrc/sys/dev/pci/bktr: bktr_audio.c bktr_card.c bktr_card.h
	    bktr_core.c bktr_core.h bktr_os.c bktr_reg.h bktr_tuner.c
Removed Files:
	syssrc/sys/dev/pci/bktr: README

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 syssrc/sys/dev/pci/bktr/README
cvs rdiff -r1.5 -r1.6 syssrc/sys/dev/pci/bktr/bktr_audio.c \
    syssrc/sys/dev/pci/bktr/bktr_card.c
cvs rdiff -r1.2 -r1.3 syssrc/sys/dev/pci/bktr/bktr_card.h \
    syssrc/sys/dev/pci/bktr/bktr_core.h
cvs rdiff -r1.7 -r1.8 syssrc/sys/dev/pci/bktr/bktr_core.c
cvs rdiff -r1.9 -r1.10 syssrc/sys/dev/pci/bktr/bktr_os.c
cvs rdiff -r1.4 -r1.5 syssrc/sys/dev/pci/bktr/bktr_reg.h \
    syssrc/sys/dev/pci/bktr/bktr_tuner.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.