[src/trunk]: src/sys/dev/pci/bktr Merge some more.

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

details:   https://anonhg.NetBSD.org/src/rev/97d0e8b66a3c
branches:  trunk
changeset: 544114:97d0e8b66a3c
user:      wiz <wiz%NetBSD.org@localhost>
date:      Wed Mar 12 00:19:20 2003 +0000

description:
Merge some more.

diffstat:

 sys/dev/pci/bktr/bktr_audio.c |   7 ++-----
 sys/dev/pci/bktr/bktr_core.c  |  16 +++-------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diffs (72 lines):

diff -r 74ae46781f4c -r 97d0e8b66a3c sys/dev/pci/bktr/bktr_audio.c
--- a/sys/dev/pci/bktr/bktr_audio.c     Wed Mar 12 00:14:40 2003 +0000
+++ b/sys/dev/pci/bktr/bktr_audio.c     Wed Mar 12 00:19:20 2003 +0000
@@ -1,6 +1,6 @@
 /* $SourceForge: bktr_audio.c,v 1.6 2003/03/11 23:11:20 thomasklausner Exp $ */
 
-/*     $NetBSD: bktr_audio.c,v 1.11 2003/03/12 00:14:40 wiz Exp $      */
+/*     $NetBSD: bktr_audio.c,v 1.12 2003/03/12 00:19:20 wiz Exp $      */
 /* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.8 2000/10/31 13:09:56 roger Exp$ */
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -49,9 +49,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_audio.c,v 1.11 2003/03/12 00:14:40 wiz Exp $");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -74,7 +71,7 @@
 
 #ifdef __NetBSD__
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_audio.c,v 1.11 2003/03/12 00:14:40 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_audio.c,v 1.12 2003/03/12 00:19:20 wiz Exp $");
 
 #include <sys/proc.h>
 #include <dev/ic/bt8xx.h>      /* NetBSD location of .h files */
diff -r 74ae46781f4c -r 97d0e8b66a3c sys/dev/pci/bktr/bktr_core.c
--- a/sys/dev/pci/bktr/bktr_core.c      Wed Mar 12 00:14:40 2003 +0000
+++ b/sys/dev/pci/bktr/bktr_core.c      Wed Mar 12 00:19:20 2003 +0000
@@ -1,6 +1,6 @@
 /* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
 
-/*     $NetBSD: bktr_core.c,v 1.28 2003/03/12 00:14:40 wiz Exp $       */
+/*     $NetBSD: bktr_core.c,v 1.29 2003/03/12 00:19:21 wiz Exp $       */
 /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
 
 /*
@@ -98,21 +98,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.28 2003/03/12 00:14:40 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.29 2003/03/12 00:19:21 wiz Exp $");
 
 #include "opt_bktr.h"          /* Include any kernel config options */
 
-#ifdef __FreeBSD__
-#include "bktr.h"
-#endif /* __FreeBSD__ */
-
-#if (                                                            \
-       (defined(__FreeBSD__) && (NBKTR > 0))                     \
-    || (defined(__bsdi__))                                       \
-    || (defined(__OpenBSD__))                                    \
-    || (defined(__NetBSD__))                                     \
-    )
-
 
 /*******************/
 /* *** FreeBSD *** */
@@ -3417,6 +3406,7 @@
 }
 
 
+
 /*
  *
  */