Module Name:	syssrc
Committed By:	wiz
Date:		Sat Dec 30 16:52:37 UTC 2000

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

Log Message:
Merge 2.18 to trunk.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 syssrc/sys/dev/ic/bt8xx.h
cvs rdiff -r1.7 -r1.8 syssrc/sys/dev/pci/bktr/bktr_audio.c
cvs rdiff -r1.8 -r1.9 syssrc/sys/dev/pci/bktr/bktr_card.c \
    syssrc/sys/dev/pci/bktr/bktr_reg.h
cvs rdiff -r1.13 -r1.14 syssrc/sys/dev/pci/bktr/bktr_core.c
cvs rdiff -r1.15 -r1.16 syssrc/sys/dev/pci/bktr/bktr_os.c
cvs rdiff -r1.6 -r1.7 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.