[src/trunk]: src/sys Disable broken radio(4) support for bktr(4). The configu...

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

details:   https://anonhg.NetBSD.org/src/rev/576042982cc1
branches:  trunk
changeset: 520317:576042982cc1
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jan 07 12:12:55 2002 +0000

description:
Disable broken radio(4) support for bktr(4). The configuration code doesn't
even check if the TV card has a radio tuner.

diffstat:

 sys/arch/i386/conf/GENERIC |  6 +++---
 sys/dev/pci/bktr/bktr_os.c |  8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r ace8bf0d4772 -r 576042982cc1 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Mon Jan 07 12:00:09 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC        Mon Jan 07 12:12:55 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.461 2002/01/06 16:07:06 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.462 2002/01/07 12:12:55 tron Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include        "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.461 $"
+#ident                 "GENERIC-$Revision: 1.462 $"
 
 maxusers       32              # estimated number of users
 
@@ -968,7 +968,7 @@
 
 # Brooktree 848/849/878/879 based TV cards
 bktr* at pci? dev ? function ?
-radio* at bktr?
+#radio* at bktr?
 
 
 # Mice
diff -r ace8bf0d4772 -r 576042982cc1 sys/dev/pci/bktr/bktr_os.c
--- a/sys/dev/pci/bktr/bktr_os.c        Mon Jan 07 12:00:09 2002 +0000
+++ b/sys/dev/pci/bktr/bktr_os.c        Mon Jan 07 12:12:55 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bktr_os.c,v 1.26 2002/01/07 10:43:43 tron Exp $        */
+/*     $NetBSD: bktr_os.c,v 1.27 2002/01/07 12:12:55 tron Exp $        */
 
 /* FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp */
 
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.26 2002/01/07 10:43:43 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.27 2002/01/07 12:12:55 tron Exp $");
 
 #ifdef __FreeBSD__
 #include "bktr.h"
@@ -195,7 +195,11 @@
 
 /* Support for radio(4) under NetBSD */
 #ifdef __NetBSD__
+#ifdef RADIO_ON_BKTR_WORKS
 #include "radio.h"
+#else
+#define        NRADIO  0
+#endif
 #if NRADIO > 0
 #include <sys/radioio.h>
 #include <dev/radio_if.h>