From 21942247f30df2d39dd05e50e42141f5d3fbc135 Mon Sep 17 00:00:00 2001 From: veego Date: Sun, 7 May 2000 14:43:31 +0000 Subject: [PATCH] It is a bad idea to declare a static bootverbose variable here. Remove it. --- sys/dev/pci/bktr/bktr_audio.c | 7 ++----- sys/dev/pci/bktr/bktr_card.c | 6 +----- sys/dev/pci/bktr/bktr_core.c | 4 +--- sys/dev/pci/bktr/bktr_os.c | 5 +---- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/sys/dev/pci/bktr/bktr_audio.c b/sys/dev/pci/bktr/bktr_audio.c index c87bcbff266f..8586d3743716 100644 --- a/sys/dev/pci/bktr/bktr_audio.c +++ b/sys/dev/pci/bktr/bktr_audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: bktr_audio.c,v 1.3 2000/05/07 13:50:10 wiz Exp $ */ +/* $NetBSD: bktr_audio.c,v 1.4 2000/05/07 14:43:31 veego Exp $ */ /* FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.2 1999/10/28 13:58:14 roger Exp */ /* @@ -52,10 +52,6 @@ #include #include #include -#ifdef __NetBSD__ -#include -static int bootverbose = 1; -#endif #ifdef __FreeBSD__ #include /* for DELAY */ @@ -69,6 +65,7 @@ static int bootverbose = 1; #endif #ifdef __NetBSD__ +#include #include /* NetBSD location of .h files */ #include #include diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c index 80c1a2f65cec..1bbe3726f284 100644 --- a/sys/dev/pci/bktr/bktr_card.c +++ b/sys/dev/pci/bktr/bktr_card.c @@ -1,4 +1,4 @@ -/* $NetBSD: bktr_card.c,v 1.2 2000/05/07 00:24:33 wiz Exp $ */ +/* $NetBSD: bktr_card.c,v 1.3 2000/05/07 14:43:32 veego Exp $ */ /* FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.9 2000/02/12 08:49:21 peter Exp */ @@ -83,10 +83,6 @@ #include #endif -#ifdef __NetBSD__ -static int bootverbose = 1; -#endif - /* Various defines */ #define HAUP_REMOTE_INT_WADDR 0x30 #define HAUP_REMOTE_INT_RADDR 0x31 diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index 35e0259c8b29..953dcfef520d 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $NetBSD: bktr_core.c,v 1.2 2000/05/07 00:24:33 wiz Exp $ */ +/* $NetBSD: bktr_core.c,v 1.3 2000/05/07 14:43:32 veego Exp $ */ /* FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.106 2000/04/16 07:50:08 roger Exp */ @@ -185,8 +185,6 @@ typedef unsigned int uintptr_t; #include #include -static int bootverbose = 1; - static int bt848_format = -1; #endif /* __NetBSD__ || __OpenBSD__ */ diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index e963fd235b78..1598f716fe47 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $NetBSD: bktr_os.c,v 1.3 2000/05/07 01:16:23 wiz Exp $ */ +/* $NetBSD: bktr_os.c,v 1.4 2000/05/07 14:43:32 veego Exp $ */ /* FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.7 2000/04/16 07:50:09 roger Exp */ @@ -168,9 +168,6 @@ SYSCTL_INT(_hw_bt848, OID_AUTO, slow_msp_audio, CTLFLAG_RW, &bt848_slow_msp_audi #include #include -static int bootverbose = 1; - - #define BKTR_DEBUG #ifdef BKTR_DEBUG int bktr_debug = 0;