[src/netbsd-1-5]: src/sys/dev/pci/bktr Pull up revision 1.1.1.2 (requested by...

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fedf9df53044
branches:  netbsd-1-5
changeset: 488363:fedf9df53044
user:      wiz <wiz%NetBSD.org@localhost>
date:      Mon Jul 03 02:20:50 2000 +0000

description:
Pull up revision 1.1.1.2 (requested by wiz):
Sync with release 2.14 of the bktr driver. Changes: mostly integration
of NetBSD changes; support for new Hauppauge tuner types.

Approved by thorpej.

diffstat:

 sys/dev/pci/bktr/bktr_os.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (12 lines):

diff -r 0a883534aeb7 -r fedf9df53044 sys/dev/pci/bktr/bktr_os.h
--- a/sys/dev/pci/bktr/bktr_os.h        Mon Jul 03 02:20:19 2000 +0000
+++ b/sys/dev/pci/bktr/bktr_os.h        Mon Jul 03 02:20:50 2000 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: bktr_os.h,v 1.1.1.1 2000/05/07 00:16:18 wiz Exp $      */
+/*     $NetBSD: bktr_os.h,v 1.1.1.1.4.1 2000/07/03 02:20:50 wiz Exp $  */
 
-/* FreeBSD: src/sys/dev/bktr/bktr_os.h,v 1.3 2000/04/16 07:50:09 roger Exp */
+/* FreeBSD: src/sys/dev/bktr/bktr_os.h,v 1.4 2000/04/16 07:56:58 roger Exp */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)