Module Name:	syssrc
Committed By:	wiz
Date:		Sat Dec 30 16:44:24 UTC 2000

Update of /cvsroot/syssrc/sys/dev/pci/bktr
In directory netbsd.hut.fi:/tmp/cvs-serv12334

Log Message:
Import release 2.18 of the bktr driver. Changes since 2.17:
o Add new ioctls to allow userland programs fuller access to the I2C
  bus, BT848_MSP_READ BT848_MSP_WRITE and BT848_MSP_RESET.
o Add tuner type 0x2a. Remove 0x2c which was incorrect.
o Christian Gusenbauer <Christian.Gusenbauer@netway.at> added support
  for audio on Hauppauge cards without the audio mux. The MSP is used
  for audio selection. (the 44xxx models) 


Vendor Tag:	FREEBSD
Release Tags:	BKTR-2_18
		
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
U syssrc/sys/dev/pci/bktr/bktr_card.h
C syssrc/sys/dev/pci/bktr/bktr_core.c
U syssrc/sys/dev/pci/bktr/bktr_core.h
U syssrc/sys/dev/pci/bktr/bktr_mem.c
U syssrc/sys/dev/pci/bktr/bktr_mem.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

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

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