diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index fbce1f466fad..eb622c2b0eeb 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.67 1999/02/25 07:45:47 roger Exp $ */
+/* $Id: brooktree848.c,v 1.68 1999/04/24 20:13:58 peter Exp $ */
 /* BT848 Driver for Brooktree's Bt848, Bt849, Bt878 and Bt 879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
@@ -6142,7 +6142,7 @@ static void msp_autodetect( bktr_ptr_t bktr ) {
 
 
 #ifdef __FreeBSD__
-static bktr_devsw_installed = 0;
+static int bktr_devsw_installed;
 
 static void
 bktr_drvinit( void *unused )
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index c640622712b5..7da59b06b99c 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.44 1999/04/22 15:19:37 davidn Exp $
+ *  dgb.c $Id: dgb.c,v 1.45 1999/04/27 11:14:22 phk Exp $
  *
  *  Digiboard driver.
  *
@@ -2289,7 +2289,7 @@ disc_optim(tp, t)
 }
 
 
-static dgb_devsw_installed = 0;
+static int dgb_devsw_installed;
 
 static void 
 dgb_drvinit(void *unused)
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index 97ff12f95748..f4243bdfbe90 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -1,5 +1,5 @@
 /*-
- *	$Id: dgm.c,v 1.8 1999/04/11 03:47:24 eivind Exp $
+ *	$Id: dgm.c,v 1.9 1999/04/27 11:14:24 phk Exp $
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
@@ -2089,7 +2089,7 @@ disc_optim(tp, t)
 }
 
 
-static dgm_devsw_installed = 0;
+static int dgm_devsw_installed;
 
 static void 
 dgm_drvinit(void *unused)
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index f64d99e501f9..2561cd23e5cc 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -235,7 +235,7 @@ get_tick ()
 }
 
 
-static joy_devsw_installed = 0;
+static int joy_devsw_installed;
 
 static void 	joy_drvinit(void *unused)
 {
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index a24a79fca7aa..8297679e4af1 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/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.100 1998/07/13 09:53:01 bde Exp $
+ *	$Id: mcd.c,v 1.101 1998/10/22 05:58:39 bde Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -1849,7 +1849,7 @@ mcd_resume(int unit)
 }
 
 
-static mcd_devsw_installed = 0;
+static int mcd_devsw_installed;
 
 static void 	mcd_drvinit(void *unused)
 {
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 6579de2d6a2a..836ec9cc7561 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/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.38 1998/06/07 17:10:47 dfr Exp $
+ * $Id: mse.c,v 1.39 1998/10/22 05:58:39 bde Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -769,7 +769,7 @@ mse_getati(port, dx, dy, but)
 	outb(port + MSE_PORTB, MSE_INPORT_INTREN);
 }
 
-static mse_devsw_installed = 0;
+static int mse_devsw_installed;
 
 static void 	mse_drvinit(void *unused)
 {
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 2cbef0e2d988..cc2f94d6bc46 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -48,7 +48,7 @@
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
  *	From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp
- *	$Id: lpt.c,v 1.1 1999/02/14 11:59:59 nsouch Exp $
+ *	$Id: lpt.c,v 1.2 1999/02/14 16:19:16 nsouch Exp $
  */
 
 /*
@@ -938,7 +938,7 @@ lptioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 	return(error);
 }
 
-static lpt_devsw_installed = 0;
+static int lpt_devsw_installed;
 
 static void
 lpt_drvinit(void *unused)
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 8eecd79e71b4..d3a09a1b9ba0 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.c,v 1.11 1999/01/30 15:35:39 nsouch Exp $
+ *	$Id: ppi.c,v 1.12 1999/02/14 11:59:59 nsouch Exp $
  *
  */
 #include "ppi.h"
@@ -530,7 +530,7 @@ ppiioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 	return (error);
 }
 
-static ppi_devsw_installed = 0;
+static int ppi_devsw_installed;
 
 static void ppi_drvinit(void *unused)
 {
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index ca9032e29eb4..613f8cb3a681 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -1495,7 +1495,7 @@ rc_wait0(nec, unit, chan, line)
 		      unit, chan, line);
 }
 
-static rc_devsw_installed = 0;
+static int rc_devsw_installed;
 
 static void 	rc_drvinit(void *unused)
 {
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 7eeca7b004c2..cc5af14cf390 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.40 1998/07/13 09:53:02 bde Exp $ */
+/* $Id: scd.c,v 1.41 1999/01/12 01:29:45 eivind Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -1569,7 +1569,7 @@ scd_toc_entry (int unit, struct ioc_read_toc_single_entry *te)
 }
 
 
-static scd_devsw_installed = 0;
+static int scd_devsw_installed;
 
 static void 	scd_drvinit(void *unused)
 {
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 670ef144dcec..add5a0bfa557 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/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.80 1999/04/24 20:17:03 peter Exp $
+ *	$Id: si.c,v 1.81 1999/04/27 11:15:14 phk Exp $
  */
 
 #ifndef lint
@@ -2812,7 +2812,7 @@ si_modulename(host_type, uart_type)
 	return("");
 }
 
-static si_devsw_installed = 0;
+static int si_devsw_installed;
 
 static void 
 si_drvinit(void *unused)
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index c640622712b5..7da59b06b99c 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.44 1999/04/22 15:19:37 davidn Exp $
+ *  dgb.c $Id: dgb.c,v 1.45 1999/04/27 11:14:22 phk Exp $
  *
  *  Digiboard driver.
  *
@@ -2289,7 +2289,7 @@ disc_optim(tp, t)
 }
 
 
-static dgb_devsw_installed = 0;
+static int dgb_devsw_installed;
 
 static void 
 dgb_drvinit(void *unused)
diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c
index 97ff12f95748..f4243bdfbe90 100644
--- a/sys/gnu/i386/isa/dgm.c
+++ b/sys/gnu/i386/isa/dgm.c
@@ -1,5 +1,5 @@
 /*-
- *	$Id: dgm.c,v 1.8 1999/04/11 03:47:24 eivind Exp $
+ *	$Id: dgm.c,v 1.9 1999/04/27 11:14:24 phk Exp $
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
@@ -2089,7 +2089,7 @@ disc_optim(tp, t)
 }
 
 
-static dgm_devsw_installed = 0;
+static int dgm_devsw_installed;
 
 static void 
 dgm_drvinit(void *unused)
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 11e6216d8d25..954012518cf3 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.62 1999/04/27 11:14:29 phk Exp $
+ *	$Id: cons.c,v 1.63 1999/04/27 12:21:03 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -414,7 +414,7 @@ cnputc(c)
 	}
 }
 
-static cn_devsw_installed = 0;
+static int cn_devsw_installed;
 
 static void
 cn_drvinit(void *unused)
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 754d79e7e29b..6a603744d1fa 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $Id: asc.c,v 1.33 1999/01/27 10:10:00 bde Exp $
+ * $Id: asc.c,v 1.34 1999/01/28 01:59:53 dillon Exp $
  */
 
 #include "asc.h"
@@ -883,7 +883,7 @@ ascpoll(dev_t dev, int events, struct proc *p)
 }
 
 
-static asc_devsw_installed = 0;
+static int asc_devsw_installed;
 
 static void 
 asc_drvinit(void *unused)
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c
index e8f7add7eaf0..c5a90971c99c 100644
--- a/sys/i386/isa/atapi-cd.c
+++ b/sys/i386/isa/atapi-cd.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: atapi-cd.c,v 1.14 1999/04/13 19:38:10 peter Exp $
+ *	$Id: atapi-cd.c,v 1.15 1999/04/27 11:14:51 phk Exp $
  */
 
 #include "wdc.h"
@@ -1517,7 +1517,7 @@ atapi_dump(int ctrlr, int lun, char *label, void *data, int len)
 	printf ("\n");
 }
 
-static acd_devsw_installed = 0;
+static int acd_devsw_installed;
 
 static void 
 acd_drvinit(void *unused)
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 413302d50471..28d61a1bbace 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.28 1998/06/14 10:52:52 bde Exp $
+ *	$Id: ctx.c,v 1.29 1998/12/09 02:56:48 eivind Exp $
  */
 
 /*
@@ -448,7 +448,7 @@ waitvb(int port)
 
 
 
-static ctx_devsw_installed = 0;
+static int ctx_devsw_installed;
 
 static void
 ctx_drvinit(void *unused)
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index 9a4a09ebd67b..7e2f8006d031 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -964,7 +964,7 @@ void cxtimeout (void *a)
 
 
 #if defined(__FreeBSD__) && (__FreeBSD__ > 1 )
-static cx_devsw_installed = 0;
+static int cx_devsw_installed;
 static void 	cx_drvinit(void *unused)
 {
 	dev_t dev;
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index b03b712ff323..b289f571bc8a 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -1159,7 +1159,7 @@ outb(CDOR,95); /*untalk*/
 }
 
 
-static gp_devsw_installed = 0;
+static int gp_devsw_installed;
 
 static void
 gp_drvinit(void *unused)
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index 1fa83761b853..7295ae75880d 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -833,7 +833,7 @@ gscioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 }
 
 
-static gsc_devsw_installed = 0;
+static int gsc_devsw_installed;
 
 static void
 gsc_drvinit(void *unused)
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 07fd93784547..5816c51e4a09 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: istallion.c,v 1.24 1999/01/30 12:17:33 phk Exp $
+ * $Id: istallion.c,v 1.25 1999/04/27 11:15:05 phk Exp $
  */
 
 /*****************************************************************************/
@@ -648,7 +648,7 @@ static	struct cdevsw	stli_cdevsw = {
 	D_TTY,
 };
 
-static stli_devsw_installed = 0;
+static int stli_devsw_installed;
 
 static void stli_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index f64d99e501f9..2561cd23e5cc 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -235,7 +235,7 @@ get_tick ()
 }
 
 
-static joy_devsw_installed = 0;
+static int joy_devsw_installed;
 
 static void 	joy_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index f542302f8c94..491675e87aaa 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: loran.c,v 1.14 1998/12/16 11:46:41 phk Exp $
+ * $Id: loran.c,v 1.15 1999/04/11 03:06:06 eivind Exp $
  *
  * This device-driver helps the userland controlprogram for a LORAN-C
  * receiver avoid monopolizing the CPU.
@@ -644,7 +644,7 @@ static struct cdevsw loran_cdevsw =
 	  NULL,		-1 };
 
 
-static loran_devsw_installed = 0;
+static int loran_devsw_installed;
 
 static void 	loran_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 4f1943a589f9..515a3b779dce 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char	MATCDVERSION[]="Version  1(26) 18-Oct-95";
 static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
 /*	The proceeding strings may not be changed*/
 
-/* $Id: matcd.c,v 1.36 1998/07/15 10:11:21 bde Exp $ */
+/* $Id: matcd.c,v 1.37 1998/12/13 23:36:16 eivind Exp $ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
@@ -2730,7 +2730,7 @@ static int matcd_igot(struct ioc_capability * sqp)
 #endif	/*FULLDRIVER*/
 
 
-static matcd_devsw_installed = 0;
+static int matcd_devsw_installed;
 
 static void
 matcd_drvinit(void *unused)
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index a24a79fca7aa..8297679e4af1 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.100 1998/07/13 09:53:01 bde Exp $
+ *	$Id: mcd.c,v 1.101 1998/10/22 05:58:39 bde Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -1849,7 +1849,7 @@ mcd_resume(int unit)
 }
 
 
-static mcd_devsw_installed = 0;
+static int mcd_devsw_installed;
 
 static void 	mcd_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 6579de2d6a2a..836ec9cc7561 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.38 1998/06/07 17:10:47 dfr Exp $
+ * $Id: mse.c,v 1.39 1998/10/22 05:58:39 bde Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -769,7 +769,7 @@ mse_getati(port, dx, dy, but)
 	outb(port + MSE_PORTB, MSE_INPORT_INTREN);
 }
 
-static mse_devsw_installed = 0;
+static int mse_devsw_installed;
 
 static void 	mse_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 4f840619bf91..ad6ae1c95e57 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.44 1998/12/13 23:32:44 eivind Exp $
+ *	$Id: pcaudio.c,v 1.45 1998/12/27 20:09:31 sos Exp $
  */
 
 #include "pca.h"
@@ -548,7 +548,7 @@ pcapoll(dev_t dev, int events, struct proc *p)
 	return (revents);
 }
 
-static pca_devsw_installed = 0;
+static int pca_devsw_installed;
 
 static void 	pca_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index ca9032e29eb4..613f8cb3a681 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -1495,7 +1495,7 @@ rc_wait0(nec, unit, chan, line)
 		      unit, chan, line);
 }
 
-static rc_devsw_installed = 0;
+static int rc_devsw_installed;
 
 static void 	rc_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 7eeca7b004c2..cc5af14cf390 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.40 1998/07/13 09:53:02 bde Exp $ */
+/* $Id: scd.c,v 1.41 1999/01/12 01:29:45 eivind Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -1569,7 +1569,7 @@ scd_toc_entry (int unit, struct ioc_read_toc_single_entry *te)
 }
 
 
-static scd_devsw_installed = 0;
+static int scd_devsw_installed;
 
 static void 	scd_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 670ef144dcec..add5a0bfa557 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.80 1999/04/24 20:17:03 peter Exp $
+ *	$Id: si.c,v 1.81 1999/04/27 11:15:14 phk Exp $
  */
 
 #ifndef lint
@@ -2812,7 +2812,7 @@ si_modulename(host_type, uart_type)
 	return("");
 }
 
-static si_devsw_installed = 0;
+static int si_devsw_installed;
 
 static void 
 si_drvinit(void *unused)
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index f767d7f99f42..347b26085756 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -275,7 +275,7 @@ struct	spigot_softc	*ss = (struct spigot_softc *)&spigot_softc[0];
 }
 
 
-static spigot_devsw_installed = 0;
+static int spigot_devsw_installed;
 
 static void 	spigot_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 9bb4890af87c..52dbaaf2a132 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: stallion.c,v 1.26 1999/04/24 20:17:04 peter Exp $
+ * $Id: stallion.c,v 1.27 1999/04/27 11:15:19 phk Exp $
  */
 
 /*****************************************************************************/
@@ -547,7 +547,7 @@ static	struct cdevsw	stl_cdevsw = {
 	D_TTY,
 };
 
-static stl_devsw_installed = 0;
+static int stl_devsw_installed;
 
 static void stl_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index 40dd43a215e2..0060e51b23bf 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -1149,7 +1149,7 @@ static int twchecktime(int target, int tol)
 #endif /* HIRESTIME */
 
 
-static tw_devsw_installed = 0;
+static int tw_devsw_installed;
 
 static void 	tw_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 9db2feeba1c7..ae952a21cbec 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.193 1999/04/13 20:22:30 peter Exp $
+ *	$Id: wd.c,v 1.194 1999/04/16 21:22:25 peter Exp $
  */
 
 /* TODO:
@@ -2393,7 +2393,7 @@ wdwait(struct disk *du, u_char bits_wanted, int timeout)
 	return (-1);
 }
 
-static wd_devsw_installed = 0;
+static int wd_devsw_installed;
 
 static void 	wd_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c
index e8f7add7eaf0..c5a90971c99c 100644
--- a/sys/i386/isa/wd_cd.c
+++ b/sys/i386/isa/wd_cd.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: atapi-cd.c,v 1.14 1999/04/13 19:38:10 peter Exp $
+ *	$Id: atapi-cd.c,v 1.15 1999/04/27 11:14:51 phk Exp $
  */
 
 #include "wdc.h"
@@ -1517,7 +1517,7 @@ atapi_dump(int ctrlr, int lun, char *label, void *data, int len)
 	printf ("\n");
 }
 
-static acd_devsw_installed = 0;
+static int acd_devsw_installed;
 
 static void 
 acd_drvinit(void *unused)
diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c
index 6f422922d01b..4f66643fb05d 100644
--- a/sys/i386/isa/wfd.c
+++ b/sys/i386/isa/wfd.c
@@ -23,7 +23,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: wfd.c,v 1.20 1999/04/13 19:38:11 peter Exp $
+ *      $Id: wfd.c,v 1.21 1999/04/27 11:15:21 phk Exp $
  */
 
 /*
@@ -764,7 +764,7 @@ static int wfd_eject (struct wfd *t, int closeit)
 		0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0);
 }
 
-static wfd_devsw_installed = 0;
+static int wfd_devsw_installed;
 
 static void 	wfd_drvinit(void *unused)
 {
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index 714e66786380..092846b4d394 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.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: wst.c,v 1.15 1999/01/12 01:28:00 eivind Exp $
+ *	$Id: wst.c,v 1.16 1999/04/13 19:38:11 peter Exp $
  */
 
 #include "wdc.h"
@@ -784,7 +784,7 @@ wst_reset(struct wst *t)
     DELAY(30);
 }
 
-static wst_devsw_installed = 0;
+static int wst_devsw_installed;
 
 static void 
 wst_drvinit(void *unused)
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index c8712ca4603d..b6dd3b6a5d77 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,7 +20,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.46 1998/10/22 05:58:41 bde Exp $
+ * $Id: wt.c,v 1.47 1998/12/18 18:07:10 bde Exp $
  *
  */
 
@@ -982,7 +982,7 @@ wtstatus (wtinfo_t *t)
 }
 
 
-static wt_devsw_installed = 0;
+static int wt_devsw_installed;
 
 static void 
 wt_drvinit(void *unused)
diff --git a/sys/isa/joy.c b/sys/isa/joy.c
index f64d99e501f9..2561cd23e5cc 100644
--- a/sys/isa/joy.c
+++ b/sys/isa/joy.c
@@ -235,7 +235,7 @@ get_tick ()
 }
 
 
-static joy_devsw_installed = 0;
+static int joy_devsw_installed;
 
 static void 	joy_drvinit(void *unused)
 {
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 1d18a86d98a2..66e6d8ed3e1d 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.57 1998/11/11 10:55:56 truckman Exp $
+ * $Id: kern_descrip.c,v 1.58 1999/01/08 17:31:08 eivind Exp $
  */
 
 #include "opt_compat.h"
@@ -1266,7 +1266,7 @@ SYSCTL_INT(_kern, KERN_MAXFILESPERPROC, maxfilesperproc,
 
 SYSCTL_INT(_kern, KERN_MAXFILES, maxfiles, CTLFLAG_RW, &maxfiles, 0, "");
 
-static fildesc_devsw_installed = 0;
+static int fildesc_devsw_installed;
 #ifdef DEVFS
 static	void *devfs_token_stdin;
 static	void *devfs_token_stdout;
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 11e6216d8d25..954012518cf3 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.62 1999/04/27 11:14:29 phk Exp $
+ *	$Id: cons.c,v 1.63 1999/04/27 12:21:03 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -414,7 +414,7 @@ cnputc(c)
 	}
 }
 
-static cn_devsw_installed = 0;
+static int cn_devsw_installed;
 
 static void
 cn_drvinit(void *unused)
diff --git a/sys/netinet/mlf_ipl.c b/sys/netinet/mlf_ipl.c
index 1b8101bd7268..014d686e587d 100644
--- a/sys/netinet/mlf_ipl.c
+++ b/sys/netinet/mlf_ipl.c
@@ -360,7 +360,7 @@ int cmd, ver;
 	DISPATCH(lkmtp, cmd, ver, iplaction, iplaction, iplaction);
 }
 # endif
-static ipl_devsw_installed = 0;
+static int ipl_devsw_installed;
 
 static void ipl_drvinit __P((void *unused))
 {
diff --git a/sys/pc98/pc98/lpt.c b/sys/pc98/pc98/lpt.c
index 7c23d7433112..a8c249ceb55d 100644
--- a/sys/pc98/pc98/lpt.c
+++ b/sys/pc98/pc98/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.24 1998/12/11 08:48:21 kato Exp $
+ *	$Id: lpt.c,v 1.25 1999/01/28 11:24:36 kato Exp $
  */
 
 /*
@@ -1422,7 +1422,7 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
 
 #endif /* INET */
 
-static lpt_devsw_installed = 0;
+static int lpt_devsw_installed;
 
 static void 	lpt_drvinit(void *unused)
 {
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index e5bcc4439bf8..a71b116dcc07 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/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.17 1998/06/08 08:55:44 kato Exp $
+ * $Id: mse.c,v 1.18 1998/10/22 05:58:45 bde Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -923,7 +923,7 @@ mse_get98m(port, dx, dy, but)
 }
 #endif
 
-static mse_devsw_installed = 0;
+static int mse_devsw_installed;
 
 static void 	mse_drvinit(void *unused)
 {
diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c
index 05ba0161b6aa..d132dc63c69f 100644
--- a/sys/pc98/pc98/pcaudio.c
+++ b/sys/pc98/pc98/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.19 1998/12/14 08:58:56 kato Exp $
+ *	$Id: pcaudio.c,v 1.20 1998/12/30 08:08:05 kato Exp $
  */
 
 #include "pca.h"
@@ -587,7 +587,7 @@ pcapoll(dev_t dev, int events, struct proc *p)
 	return (revents);
 }
 
-static pca_devsw_installed = 0;
+static int pca_devsw_installed;
 
 static void 	pca_drvinit(void *unused)
 {
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 653425544ab5..4c256b3aea65 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.77 1999/04/03 15:51:54 kato Exp $
+ *	$Id: wd.c,v 1.78 1999/04/18 14:42:20 kato Exp $
  */
 
 /* TODO:
@@ -2773,7 +2773,7 @@ wdwait(struct disk *du, u_char bits_wanted, int timeout)
 	return (-1);
 }
 
-static wd_devsw_installed = 0;
+static int wd_devsw_installed;
 
 static void 	wd_drvinit(void *unused)
 {
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index e8f7add7eaf0..c5a90971c99c 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.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: atapi-cd.c,v 1.14 1999/04/13 19:38:10 peter Exp $
+ *	$Id: atapi-cd.c,v 1.15 1999/04/27 11:14:51 phk Exp $
  */
 
 #include "wdc.h"
@@ -1517,7 +1517,7 @@ atapi_dump(int ctrlr, int lun, char *label, void *data, int len)
 	printf ("\n");
 }
 
-static acd_devsw_installed = 0;
+static int acd_devsw_installed;
 
 static void 
 acd_drvinit(void *unused)
diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c
index 6f422922d01b..4f66643fb05d 100644
--- a/sys/pc98/pc98/wfd.c
+++ b/sys/pc98/pc98/wfd.c
@@ -23,7 +23,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: wfd.c,v 1.20 1999/04/13 19:38:11 peter Exp $
+ *      $Id: wfd.c,v 1.21 1999/04/27 11:15:21 phk Exp $
  */
 
 /*
@@ -764,7 +764,7 @@ static int wfd_eject (struct wfd *t, int closeit)
 		0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0);
 }
 
-static wfd_devsw_installed = 0;
+static int wfd_devsw_installed;
 
 static void 	wfd_drvinit(void *unused)
 {
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index 714e66786380..092846b4d394 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.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: wst.c,v 1.15 1999/01/12 01:28:00 eivind Exp $
+ *	$Id: wst.c,v 1.16 1999/04/13 19:38:11 peter Exp $
  */
 
 #include "wdc.h"
@@ -784,7 +784,7 @@ wst_reset(struct wst *t)
     DELAY(30);
 }
 
-static wst_devsw_installed = 0;
+static int wst_devsw_installed;
 
 static void 
 wst_drvinit(void *unused)
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index fbce1f466fad..eb622c2b0eeb 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.67 1999/02/25 07:45:47 roger Exp $ */
+/* $Id: brooktree848.c,v 1.68 1999/04/24 20:13:58 peter Exp $ */
 /* BT848 Driver for Brooktree's Bt848, Bt849, Bt878 and Bt 879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
@@ -6142,7 +6142,7 @@ static void msp_autodetect( bktr_ptr_t bktr ) {
 
 
 #ifdef __FreeBSD__
-static bktr_devsw_installed = 0;
+static int bktr_devsw_installed;
 
 static void
 bktr_drvinit( void *unused )
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index 949c49711904..a832691301bd 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -2082,7 +2082,7 @@ meteor_mmap(dev_t dev, vm_offset_t offset, int nprot)
 
 
 #if !defined(METEOR_FreeBSD_210)	/* XXX */
-static meteor_devsw_installed = 0;
+static int meteor_devsw_installed;
 
 static void 	meteor_drvinit(void *unused)
 {
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 30bc1c1f9719..30ae7e75d5d5 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.61 1999/04/10 17:54:43 eivind Exp $
+ * $Id: vm_swap.c,v 1.62 1999/04/27 11:18:52 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -358,7 +358,7 @@ swaponvp(p, vp, dev, nblks)
 	return (0);
 }
 
-static sw_devsw_installed = 0;
+static int sw_devsw_installed;
 #ifdef DEVFS
 static void *drum_devfs_token;
 #endif