Julian forgot to make the *devsw structures static.

26 files changed, 48 insertions, 48 deletions

diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 4624a28..9db6f41 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.36 1995/11/29 14:39:24 julian Exp $
+ *	$Id: cons.c,v 1.37 1995/12/08 11:13:21 julian Exp $
  */
 
 #include <sys/param.h>
@@ -77,7 +77,7 @@ static	d_ioctl_t	cnioctl;
 static	d_select_t	cnselect;
 
 #define CDEV_MAJOR 0
-struct cdevsw cn_cdevsw = 
+static struct cdevsw cn_cdevsw = 
 	{ cnopen,	cnclose,	cnread,		cnwrite,	/*0*/
 	  cnioctl,	nullstop,	nullreset,	nodevtotty,/* console */
 	  cnselect,	nommap,		NULL,	"console",	NULL,	-1 };
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 6d8a94c..5702d87 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.22 1995/12/07 12:45:34 davidg Exp $
+ *	$Id: mem.c,v 1.23 1995/12/08 11:13:25 julian Exp $
  */
 
 /*
@@ -77,7 +77,7 @@ static	d_ioctl_t	mmioctl;
 static	d_mmap_t	memmmap;
 
 #define CDEV_MAJOR 2
-struct cdevsw mem_cdevsw = 
+static struct cdevsw mem_cdevsw = 
 	{ mmopen,	mmclose,	mmrw,		mmrw,		/*2*/
 	  mmioctl,	nullstop,	nullreset,	nodevtotty,/* memory */
 	  seltrue,	memmmap,	NULL,	"mem",	NULL, -1 };
diff --git a/sys/i386/isa/b004.c b/sys/i386/isa/b004.c
index d39231a..ff2a3f2 100644
--- a/sys/i386/isa/b004.c
+++ b/sys/i386/isa/b004.c
@@ -130,7 +130,7 @@ static	d_ioctl_t	bquioctl;
 static	d_select_t	bquselect;
 
 #define CDEV_MAJOR 8
-struct cdevsw bqu_cdevsw = 
+static struct cdevsw bqu_cdevsw = 
 	{ bquopen,      bquclose,       bquread,        bquwrite,       /*8*/
 	  bquioctl,     nostop,         nullreset,      nodevtotty,/* tputer */
 	  bquselect,    nommap,         NULL,	"bqu",	NULL,	-1 };
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 817d539..7739cea 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.11 1995/12/06 23:42:26 bde Exp $
+ *	$Id: ctx.c,v 1.12 1995/12/08 11:13:56 julian Exp $
  */
 
 /*
@@ -149,7 +149,7 @@ static	d_write_t	ctxwrite;
 static	d_ioctl_t	ctxioctl;
 #define CDEV_MAJOR 40
 
-struct cdevsw ctx_cdevsw = 
+static struct cdevsw ctx_cdevsw = 
 	{ ctxopen,	ctxclose,	ctxread,	ctxwrite,	/*40*/
 	  ctxioctl,	nostop,		nullreset,	nodevtotty,/* cortex */
 	  seltrue,	nommap,		NULL,	"ctx",	NULL,	-1 };
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index b634db0..d50a569 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -89,7 +89,7 @@ static	d_ttycv_t	cxdevtotty;
 
 # define CDEV_MAJOR 42
 
-struct cdevsw cx_cdevsw = 
+static struct cdevsw cx_cdevsw = 
 	{ cxopen,	cxclose,	cxread,		cxwrite,	/*42*/
 	  cxioctl,	cxstop,		nullreset,	cxdevtotty,/* cronyx */
 	  cxselect,	nommap,		NULL,	"cx",	NULL,	-1 };
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index acd4db6..bc078cc 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.23 1995/12/06 23:42:34 bde Exp $
+ *	$Id: cy.c,v 1.24 1995/12/08 11:14:04 julian Exp $
  */
 
 #include "cy.h"
@@ -371,7 +371,7 @@ static	d_stop_t	cystop;
 static	d_ttycv_t	cydevtotty;
 
 #define CDEV_MAJOR 48
-struct cdevsw cy_cdevsw = 
+static struct cdevsw cy_cdevsw = 
 	{ cyopen,	cyclose,	cyread,		cywrite,	/*48*/
 	  cyioctl,	cystop,		nxreset,	cydevtotty,/*cyclades*/
 	  ttselect,	nxmmap,		NULL, "cy",	NULL,	-1 };
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index e1b3436..78c4840 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.72 1995/11/28 09:41:00 julian Exp $
+ *	$Id: fd.c,v 1.73 1995/12/08 11:14:10 julian Exp $
  *
  */
 
@@ -350,11 +350,11 @@ static	d_strategy_t	fdstrategy;
 #define CDEV_MAJOR 9
 #define BDEV_MAJOR 2
 extern	struct cdevsw fd_cdevsw;
-struct bdevsw fd_bdevsw = 
+static struct bdevsw fd_bdevsw = 
 	{ Fdopen,	fdclose,	fdstrategy,	fdioctl,	/*2*/
 	  nxdump,	zerosize,	0,	"fd",	&fd_cdevsw,	-1 };
 
-struct cdevsw fd_cdevsw = 
+static struct cdevsw fd_cdevsw = 
 	{ Fdopen,	fdclose,	rawread,	rawwrite,	/*9*/
 	  fdioctl,	nostop,		nullreset,	nodevtotty,
 	  seltrue,	nommap,		fdstrategy,	"fd",
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 76e11d9..43388bc 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -82,7 +82,7 @@ static	d_write_t	gpwrite;
 static	d_ioctl_t	gpioctl;
 
 #define CDEV_MAJOR 44
-struct cdevsw gp_cdevsw = 
+static struct cdevsw gp_cdevsw = 
 	{ gpopen,	gpclose,	noread,		gpwrite,	/*44*/
 	  gpioctl,	nostop,		nullreset,	nodevtotty,/* GPIB */
           seltrue,	nommap,		NULL,	"gp",	NULL,	-1 };
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index f8369e5..b564997 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -189,7 +189,7 @@ static	d_read_t	gscread;
 static	d_ioctl_t	gscioctl;
 
 #define CDEV_MAJOR 47
-struct cdevsw gsc_cdevsw = 
+static struct cdevsw gsc_cdevsw = 
 	{ gscopen,      gscclose,       gscread,        nowrite,	/*47*/
 	  gscioctl,     nostop,         nullreset,      nodevtotty,/* gsc */
 	  seltrue,      nommap,         NULL,	"gsc",	NULL,	-1 };
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index 2955d1c..99008ad 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -91,7 +91,7 @@ static	d_close_t	joyclose;
 static	d_read_t	joyread;
 static	d_ioctl_t	joyioctl;
 
-struct cdevsw joy_cdevsw = 
+static struct cdevsw joy_cdevsw = 
 	{ joyopen,	joyclose,	joyread,	nowrite,	/*51*/
 	  joyioctl,	nostop,		nullreset,	nodevtotty,/*joystick */
 	  seltrue,	nommap,		NULL,	"joy",	NULL,	-1 };
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 97984ee..a3287d6 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -289,7 +289,7 @@ static	d_ioctl_t	labpcioctl;
 static	d_strategy_t	labpcstrategy;
 
 #define CDEV_MAJOR 66
-struct cdevsw labpc_cdevsw = 
+static struct cdevsw labpc_cdevsw = 
 	{ labpcopen,	labpcclose,	rawread,	rawwrite,	/*66*/
 	  labpcioctl,	nostop,		nullreset,	nodevtotty,/* labpc */
 	  seltrue,	nommap,		labpcstrategy, "labpc",	NULL,	-1 };
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 81d503b..df0d0d9 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.45 1995/12/07 12:46:03 davidg Exp $
+ *	$Id: lpt.c,v 1.46 1995/12/08 11:14:30 julian Exp $
  */
 
 /*
@@ -292,7 +292,7 @@ static	d_write_t	lptwrite;
 static	d_ioctl_t	lptioctl;
 
 #define CDEV_MAJOR 16
-struct cdevsw lpt_cdevsw = 
+static struct cdevsw lpt_cdevsw = 
 	{ lptopen,	lptclose,	noread,		lptwrite,	/*16*/
 	  lptioctl,	nullstop,	nullreset,	nodevtotty,/* lpt */
 	  seltrue,	nommap,		nostrat,	"lpt",	NULL,	-1 };
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index ee2e03a..8bd2782 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.51 1995/11/29 14:39:46 julian Exp $
+ *	$Id: mcd.c,v 1.52 1995/12/08 11:14:34 julian Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -222,11 +222,11 @@ static	d_strategy_t	mcdstrategy;
 #define CDEV_MAJOR 29
 #define BDEV_MAJOR 7
 extern	struct cdevsw mcd_cdevsw;
-struct bdevsw mcd_bdevsw = 
+static struct bdevsw mcd_bdevsw = 
 	{ mcdopen,	mcdclose,	mcdstrategy,	mcdioctl,	/*7*/
 	  nxdump,	mcdsize,	0,	"mcd",	&mcd_cdevsw,	-1 };
 
-struct cdevsw mcd_cdevsw = 
+static struct cdevsw mcd_cdevsw = 
 	{ mcdopen,	mcdclose,	rawread,	nowrite,	/*29*/
 	  mcdioctl,	nostop,		nullreset,	nodevtotty,
 	  seltrue,	nommap,		mcdstrategy,	"mcd",
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 96f62e5..2196a4c 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.19 1995/12/06 23:42:53 bde Exp $
+ * $Id: mse.c,v 1.20 1995/12/08 11:14:40 julian Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -79,7 +79,7 @@ static	d_read_t	mseread;
 static	d_select_t	mseselect;
 
 #define CDEV_MAJOR 27
-struct cdevsw mse_cdevsw = 
+static struct cdevsw mse_cdevsw = 
 	{ mseopen,	mseclose,	mseread,	nowrite,	/*27*/
 	  noioc,	nostop,		nullreset,	nodevtotty,/* mse */
 	  mseselect,	nommap,		NULL,	"mse",	NULL,	-1 };
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index d0bb085..070ec8f 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.21 1995/12/01 23:09:20 julian Exp $
+ *	$Id: pcaudio.c,v 1.22 1995/12/08 11:14:45 julian Exp $
  */
 
 #include "pca.h"
@@ -101,7 +101,7 @@ static	d_ioctl_t	pcaioctl;
 static	d_select_t	pcaselect;
 
 #define CDEV_MAJOR 24
-struct cdevsw pca_cdevsw = 
+static struct cdevsw pca_cdevsw = 
  	{ pcaopen,      pcaclose,       noread,         pcawrite,       /*24*/
  	  pcaioctl,     nostop,         nullreset,      nodevtotty,/* pcaudio */
  	  pcaselect,	nommap,		NULL,	"pca",	NULL,	-1 };
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 83db4c6..206b38f 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -109,7 +109,7 @@ static	d_stop_t	rcstop;
 static	d_ttycv_t	rcdevtotty;
 
 #define CDEV_MAJOR 63
-struct cdevsw rc_cdevsw = 
+static struct cdevsw rc_cdevsw = 
 	{ rcopen,       rcclose,        rcread,         rcwrite,        /*63*/
 	  rcioctl,      rcstop,         nxreset,        rcdevtotty,/* rc */
 	  ttselect,	nommap,		NULL,	"rc",	NULL,	-1 };
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index a111bba..4768a44 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.12 1995/11/29 14:39:53 julian Exp $ */
+/* $Id: scd.c,v 1.13 1995/12/08 11:15:01 julian Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -199,11 +199,11 @@ static	d_strategy_t	scdstrategy;
 #define CDEV_MAJOR 45
 #define BDEV_MAJOR 16
 extern	struct cdevsw scd_cdevsw;
-struct bdevsw scd_bdevsw = 
+static struct bdevsw scd_bdevsw = 
 	{ scdopen,	scdclose,	scdstrategy,	scdioctl,	/*16*/
 	  nxdump,	scdsize,	0, "scd",	&scd_cdevsw,	-1 };
 
-struct cdevsw scd_cdevsw = 
+static struct cdevsw scd_cdevsw = 
 	{ scdopen,	scdclose,	rawread,	nowrite,	/*45*/
 	  scdioctl,	nostop,		nullreset,	nodevtotty,/* sony cd */
 	  seltrue,	nommap,		scdstrategy,	"scd",
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index cc1d6a7..1e930c3 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.22 1995/12/07 12:46:06 davidg Exp $
+ *	$Id: si.c,v 1.23 1995/12/08 11:15:05 julian Exp $
  */
 
 #ifndef lint
@@ -122,7 +122,7 @@ static	d_stop_t	sistop;
 static	d_ttycv_t	sidevtotty;
 
 #define CDEV_MAJOR 68
-struct cdevsw si_cdevsw = 
+static struct cdevsw si_cdevsw = 
 	{ siopen,	siclose,	siread,		siwrite,	/*68*/
 	  siioctl,	sistop,		nxreset,	sidevtotty,/* si */
 	  ttselect,	nxmmap,		NULL,	"si",	NULL,	-1 };
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index d44d7bc..61cd485 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.124 1995/12/06 23:43:07 bde Exp $
+ *	$Id: sio.c,v 1.125 1995/12/08 11:15:12 julian Exp $
  */
 
 #include "sio.h"
@@ -311,7 +311,7 @@ static	d_stop_t	siostop;
 static	d_ttycv_t	siodevtotty;
 
 #define CDEV_MAJOR 28
-struct cdevsw sio_cdevsw = 
+static struct cdevsw sio_cdevsw = 
 	{ sioopen,	sioclose,	sioread,	siowrite,	/*28*/
 	  sioioctl,	siostop,	nxreset,	siodevtotty,/* sio */
 	  ttselect,	nommap,		NULL,	driver_name,	NULL,	-1 };
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index ad4888f..8fb9bf8 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: soundcard.c,v 1.36 1995/12/06 23:51:21 bde Exp $
+ * $Id: soundcard.c,v 1.37 1995/12/08 11:16:44 julian Exp $
  */
 
 #include "sound_config.h"
@@ -81,7 +81,7 @@ static d_ioctl_t	sndioctl;
 static d_select_t	sndselect;
 
 #define CDEV_MAJOR 30
-struct cdevsw snd_cdevsw = 
+static struct cdevsw snd_cdevsw = 
 	{ sndopen,	sndclose,	sndread,	sndwrite,	/*30*/
   	  sndioctl,	nostop,		nullreset,	nodevtotty,/* sound */
   	  sndselect,	nommap,		NULL,	"snd", NULL, -1 };
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index e542887..e46a1ba 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -109,7 +109,7 @@ static	d_select_t	spigot_select;
 static	d_mmap_t	spigot_mmap;
 
 #define CDEV_MAJOR 11
-struct cdevsw spigot_cdevsw = 
+static struct cdevsw spigot_cdevsw = 
 	{ spigot_open,	spigot_close,	spigot_read,	spigot_write,	/*11*/
 	  spigot_ioctl,	nostop,		nullreset,	nodevtotty,/* Spigot */
 	  spigot_select, spigot_mmap,	NULL,	"spigot",	NULL,	-1  };
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 160c18b..07cdb72 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.20 1995/11/29 14:39:59 julian Exp $
+ *    $Id: spkr.c,v 1.21 1995/12/08 11:15:21 julian Exp $
  */
 
 #include "speaker.h"
@@ -37,7 +37,7 @@ static	d_write_t	spkrwrite;
 static	d_ioctl_t	spkrioctl;
 
 #define CDEV_MAJOR 26
-struct cdevsw spkr_cdevsw = 
+static struct cdevsw spkr_cdevsw = 
 	{ spkropen,     spkrclose,      noread,         spkrwrite,      /*26*/
 	  spkrioctl,    nostop,         nullreset,      nodevtotty,/* spkr */
 	  seltrue,	nommap,		NULL,	"spkr",	NULL,	-1 };
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index f8406f0..79a0a11 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -213,7 +213,7 @@ static	d_write_t	twwrite;
 static	d_select_t	twselect;
 
 #define CDEV_MAJOR 19
-struct cdevsw tw_cdevsw = 
+static struct cdevsw tw_cdevsw = 
 	{ twopen,	twclose,	twread,		twwrite,	/*19*/
 	  noioc,	nullstop,	nullreset,	nodevtotty, /* tw */
 	  twselect,	nommap,		nostrat,	"tw",	NULL,	-1 };
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index 2b57f3a..f0d1fa4 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -46,11 +46,11 @@ static	d_strategy_t	wcdstrategy;
 #define CDEV_MAJOR 69
 #define BDEV_MAJOR 19
 extern	struct cdevsw wcd_cdevsw;
-struct bdevsw wcd_bdevsw = 
+static struct bdevsw wcd_bdevsw = 
 	{ wcdbopen,	wcdbclose,	wcdstrategy,	wcdioctl,	/*19*/
 	  nxdump,	zerosize,	0,	"wcd",	&wcd_cdevsw,	-1 };
 
-struct cdevsw wcd_cdevsw = 
+static struct cdevsw wcd_cdevsw = 
 	{ wcdropen,	wcdrclose,	rawread,	nowrite,	/*69*/
 	  wcdioctl,	nostop,		nullreset,	nodevtotty,/* atapi */
 	  seltrue,	nommap,		wcdstrategy,	"wcd",
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 1822a8b..f9fe93f 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.96 1995/12/07 12:46:12 davidg Exp $
+ *	$Id: wd.c,v 1.97 1995/12/08 11:15:43 julian Exp $
  */
 
 /* TODO:
@@ -311,11 +311,11 @@ static	d_strategy_t	wdstrategy;
 #define CDEV_MAJOR 3
 #define BDEV_MAJOR 0
 extern	struct cdevsw wd_cdevsw;
-struct bdevsw wd_bdevsw = 
+static struct bdevsw wd_bdevsw = 
 	{ wdopen,	wdclose,	wdstrategy,	wdioctl,	/*0*/
 	  wddump,	wdsize,		0,	"wd",	&wd_cdevsw,	-1 };
 
-struct cdevsw wd_cdevsw = 
+static struct cdevsw wd_cdevsw = 
 	{ wdopen,	wdclose,	rawread,	rawwrite,	/*3*/
 	  wdioctl,	nostop,		nullreset,	nodevtotty,/* wd */
 	  seltrue,	nommap,		wdstrategy,	"wd",
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 6fc75d8..7ea8b7e 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.23 1995/11/29 14:40:11 julian Exp $
+ * $Id: wt.c,v 1.24 1995/12/08 11:15:48 julian Exp $
  *
  */
 
@@ -207,11 +207,11 @@ static	d_strategy_t	wtstrategy;
 #define BDEV_MAJOR 3
 
 extern struct cdevsw wt_cdevsw; 
-struct bdevsw wt_bdevsw = 
+static struct bdevsw wt_bdevsw = 
 	{ wtopen,	wtclose,	wtstrategy,	wtioctl,	/*3*/
 	  wtdump,	wtsize,		B_TAPE,	"wt",	&wt_cdevsw,	-1 };
 
-struct cdevsw wt_cdevsw = 
+static struct cdevsw wt_cdevsw = 
 	{ wtopen,	wtclose,	rawread,	rawwrite,	/*10*/
 	  wtioctl,	nostop,		nullreset,	nodevtotty,/* wt */
 	  seltrue,	nommap,		wtstrategy,	"wt",