Subject: CVS commit: syssrc
To: None <>
From: Thomas Klausner <>
List: source-changes
Date: 10/28/2000 17:18:02
Module Name:	syssrc
Committed By:	wiz
Date:		Sat Oct 28 14:18:02 UTC 2000

Update of /cvsroot/syssrc/sys/dev/pci/bktr
In directory

Log Message:
Import release 2.17 of the bktr driver.
Changes: Integration of some NetBSD changes. (FreeBSD version now is also
usable as a KLD (~= LKM).)

Vendor Tag:	FREEBSD
Release Tags:	BKTR-2_17
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
N syssrc/sys/dev/pci/bktr/bktr_mem.c
N 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