diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index a0a4f070bf56..a444ed62f3c0 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/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.19 1995/11/04 16:00:25 markm Exp $
+ *	$Id: mem.c,v 1.20 1995/11/29 10:47:18 julian Exp $
  */
 
 /*
@@ -399,8 +399,9 @@ static void 	mem_drvinit(void *unused)
 		cdevsw_add(&dev,&mem_cdevsw,NULL);
 		mem_devsw_installed = 1;
 #ifdef DEVFS
-	memdevfs_init(dev);
+		memdevfs_init(dev);
 #endif
+	}
 }
 
 SYSINIT(memdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,mem_drvinit,NULL)
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index c4739ae67c88..9ce995757e4d 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/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.20 1995/11/28 09:40:56 julian Exp $
+ *	$Id: cy.c,v 1.21 1995/11/29 10:47:35 julian Exp $
  */
 
 #include "cy.h"
@@ -2545,8 +2545,8 @@ static void 	cy_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"cy",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(cydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cy_drvinit,NULL)
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index c4739ae67c88..9ce995757e4d 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.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.20 1995/11/28 09:40:56 julian Exp $
+ *	$Id: cy.c,v 1.21 1995/11/29 10:47:35 julian Exp $
  */
 
 #include "cy.h"
@@ -2545,8 +2545,8 @@ static void 	cy_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"cy",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(cydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cy_drvinit,NULL)
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 11a868acd141..b6e70796d38f 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.5 1995/11/04 13:22:59 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.6 1995/11/29 10:47:03 julian Exp $
  *
  *  Digiboard driver.
  *
@@ -2010,8 +2010,8 @@ static void 	dgb_drvinit(void *unused)
 /*	path	name	major		minor	type   uid gid perm*/
 	"/",	"dgb",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(dgbdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,dgb_drvinit,NULL)
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index e90e90f1a9e9..25d2311ffc04 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -239,8 +239,8 @@ static void 	joy_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"joy",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(joydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,joy_drvinit,NULL)
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 4ab0b9c2b7d1..5f7f68b0f61e 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.49 1995/11/28 09:41:22 julian Exp $
+ *	$Id: mcd.c,v 1.50 1995/11/29 10:47:44 julian Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -1703,8 +1703,8 @@ static void 	mcd_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"mcd",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(mcddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,mcd_drvinit,NULL)
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 52195fbdd61a..82411de56d3a 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.16 1995/11/28 09:41:25 julian Exp $
+ * $Id: mse.c,v 1.17 1995/11/29 10:47:46 julian Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -599,8 +599,8 @@ static void 	mse_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"mse",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(msedev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,mse_drvinit,NULL)
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index e1d80cb9ddc2..deea59594ca8 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -1526,8 +1526,8 @@ static void 	rc_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"rc",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(rcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,rc_drvinit,NULL)
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 0e2a1309f557..edffabf2111d 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.10 1995/11/28 09:41:36 julian Exp $ */
+/* $Id: scd.c,v 1.11 1995/11/29 10:47:50 julian Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -1563,8 +1563,8 @@ static void 	scd_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"scd",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(scddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,scd_drvinit,NULL)
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 7b58916f7828..1f33ad992578 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.17 1995/11/28 09:41:39 julian Exp $
+ *	$Id: si.c,v 1.18 1995/11/29 10:47:51 julian Exp $
  */
 
 #ifndef lint
@@ -2330,8 +2330,8 @@ static void 	si_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"si",	major(dev_chr),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(sidev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,si_drvinit,NULL)
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 7cabae4b5da4..7692fd16c151 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.120 1995/11/28 09:41:47 julian Exp $
+ *	$Id: sio.c,v 1.121 1995/11/29 10:47:54 julian Exp $
  */
 
 #include "sio.h"
@@ -2589,8 +2589,8 @@ static void 	sio_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"sio",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(siodev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,sio_drvinit,NULL)
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index c89c975baeff..ec1b9282d679 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -522,8 +522,8 @@ static void 	snp_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"snp",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(snpdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,snp_drvinit,NULL)
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 620ec9fe30e5..9d45e3361ff0 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/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.18 1995/11/28 09:41:55 julian Exp $
+ *    $Id: spkr.c,v 1.19 1995/11/29 10:47:57 julian Exp $
  */
 
 #include "speaker.h"
@@ -593,8 +593,8 @@ static void 	spkr_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"spkr",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(spkrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spkr_drvinit,NULL)
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 1062d4c2a4c1..1a163641bda8 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -630,8 +630,8 @@ static void 	vn_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"vn",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(vndev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,vn_drvinit,NULL)
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 11a868acd141..b6e70796d38f 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.5 1995/11/04 13:22:59 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.6 1995/11/29 10:47:03 julian Exp $
  *
  *  Digiboard driver.
  *
@@ -2010,8 +2010,8 @@ static void 	dgb_drvinit(void *unused)
 /*	path	name	major		minor	type   uid gid perm*/
 	"/",	"dgb",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(dgbdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,dgb_drvinit,NULL)
diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c
index 09130033434b..a68513199261 100644
--- a/sys/gnu/i386/isa/nic3008.c
+++ b/sys/gnu/i386/isa/nic3008.c
@@ -1,6 +1,6 @@
-static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.9 1995/11/21 14:56:01 bde Exp $";
+static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.10 1995/11/29 10:47:04 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.9 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.10 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,12 @@ static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.9 1995/11/21 14:56:01 bde E
  *
  *******************************************************************************
  * $Log: nic3008.c,v $
+ * Revision 1.10  1995/11/29  10:47:04  julian
+ * OK, that's it..
+ * That's EVERY SINGLE driver that has an entry in conf.c..
+ * my next trick will be to define cdevsw[] and bdevsw[]
+ * as empty arrays and remove all those DAMNED defines as well..
+ *
  * Revision 1.9  1995/11/21  14:56:01  bde
  * Completed function declarations, added prototypes and removed redundant
  * declarations.
@@ -1243,8 +1249,8 @@ static void 	nic_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"nic",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(nicdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,nic_drvinit,NULL)
diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c
index 083d50f1a3d6..0a6fe041041e 100644
--- a/sys/gnu/i386/isa/nic3009.c
+++ b/sys/gnu/i386/isa/nic3009.c
@@ -1,6 +1,6 @@
-static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.9 1995/11/21 14:56:02 bde Exp $";
+static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.10 1995/11/29 10:47:05 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.9 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.10 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,12 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.9 1995/11/21 14:56:02 bde E
  *
  *******************************************************************************
  * $Log: nic3009.c,v $
+ * Revision 1.10  1995/11/29  10:47:05  julian
+ * OK, that's it..
+ * That's EVERY SINGLE driver that has an entry in conf.c..
+ * my next trick will be to define cdevsw[] and bdevsw[]
+ * as empty arrays and remove all those DAMNED defines as well..
+ *
  * Revision 1.9  1995/11/21  14:56:02  bde
  * Completed function declarations, added prototypes and removed redundant
  * declarations.
@@ -1306,8 +1312,8 @@ static void 	nnic_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"nnic",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(nnicdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,nnic_drvinit,NULL)
diff --git a/sys/gnu/isdn/iispy.c b/sys/gnu/isdn/iispy.c
index 50a9a7929d17..2e498043582d 100644
--- a/sys/gnu/isdn/iispy.c
+++ b/sys/gnu/isdn/iispy.c
@@ -1,6 +1,6 @@
-static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.4 1995/09/08 11:06:56 bde Exp $";
+static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.5 1995/11/29 10:47:07 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.4 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.5 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,12 @@ static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.4 1995/09/08 11:06:56 bde Exp
  *
  *******************************************************************************
  * $Log: iispy.c,v $
+ * Revision 1.5  1995/11/29  10:47:07  julian
+ * OK, that's it..
+ * That's EVERY SINGLE driver that has an entry in conf.c..
+ * my next trick will be to define cdevsw[] and bdevsw[]
+ * as empty arrays and remove all those DAMNED defines as well..
+ *
  * Revision 1.4  1995/09/08  11:06:56  bde
  * Fix benign type mismatches in devsw functions.  82 out of 299 devsw
  * functions were wrong.
@@ -216,8 +222,8 @@ static void 	ispy_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"ispy",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(ispydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,ispy_drvinit,NULL)
diff --git a/sys/gnu/isdn/iitel.c b/sys/gnu/isdn/iitel.c
index a714f38652d4..1da86badca76 100644
--- a/sys/gnu/isdn/iitel.c
+++ b/sys/gnu/isdn/iitel.c
@@ -1,6 +1,6 @@
-static char     _itelid[] = "@(#)$Id: iitel.c,v 1.6 1995/11/16 10:22:29 bde Exp $";
+static char     _itelid[] = "@(#)$Id: iitel.c,v 1.7 1995/11/29 10:47:08 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.6 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.7 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,12 @@ static char     _itelid[] = "@(#)$Id: iitel.c,v 1.6 1995/11/16 10:22:29 bde Exp
  *
  *******************************************************************************
  * $Log: iitel.c,v $
+ * Revision 1.7  1995/11/29  10:47:08  julian
+ * OK, that's it..
+ * That's EVERY SINGLE driver that has an entry in conf.c..
+ * my next trick will be to define cdevsw[] and bdevsw[]
+ * as empty arrays and remove all those DAMNED defines as well..
+ *
  * Revision 1.6  1995/11/16  10:22:29  bde
  * Fixed the type of itel_input().  A trailing arg was missing.
  *
@@ -294,8 +300,8 @@ static void 	itel_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"itel",	major(dev_chr),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(iteldev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,itel_drvinit,NULL)
diff --git a/sys/gnu/isdn/iitty.c b/sys/gnu/isdn/iitty.c
index bd39e8308b8c..573920d4b6aa 100644
--- a/sys/gnu/isdn/iitty.c
+++ b/sys/gnu/isdn/iitty.c
@@ -1,6 +1,6 @@
-static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.12 1995/11/16 10:35:29 bde Exp $";
+static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.13 1995/11/29 10:47:09 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.12 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.13 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,12 @@ static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.12 1995/11/16 10:35:29 bde Exp
  *
  *******************************************************************************
  * $Log: iitty.c,v $
+ * Revision 1.13  1995/11/29  10:47:09  julian
+ * OK, that's it..
+ * That's EVERY SINGLE driver that has an entry in conf.c..
+ * my next trick will be to define cdevsw[] and bdevsw[]
+ * as empty arrays and remove all those DAMNED defines as well..
+ *
  * Revision 1.12  1995/11/16  10:35:29  bde
  * Fixed the type of ity_input().  A trailing arg was missing.
  *
@@ -482,8 +488,8 @@ static void 	ity_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"ity",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(itydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,ity_drvinit,NULL)
diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c
index 9338a5e5b2b4..8686dea45344 100644
--- a/sys/gnu/isdn/isdn.c
+++ b/sys/gnu/isdn/isdn.c
@@ -1,6 +1,6 @@
-static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.6 1995/11/16 10:47:21 bde Exp $";
+static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.7 1995/11/29 10:47:10 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.6 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.7 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,12 @@ static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.6 1995/11/16 10:47:21 bde Exp $
  *
  *******************************************************************************
  * $Log: isdn.c,v $
+ * Revision 1.7  1995/11/29  10:47:10  julian
+ * OK, that's it..
+ * That's EVERY SINGLE driver that has an entry in conf.c..
+ * my next trick will be to define cdevsw[] and bdevsw[]
+ * as empty arrays and remove all those DAMNED defines as well..
+ *
  * Revision 1.6  1995/11/16  10:47:21  bde
  * Fixed a call to the listen function.  A trailing arg was missing.
  *
@@ -691,8 +697,8 @@ static void 	isdn_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"isdn",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(isdndev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,isdn_drvinit,NULL)
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 2b286b4926dd..d1167dd28eb0 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -13,7 +13,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.16 1995/11/28 09:44:42 julian Exp $
+ *	$Id: apm.c,v 1.17 1995/11/29 10:47:13 julian Exp $
  */
 
 #include "apm.h"
@@ -1005,8 +1005,8 @@ static void 	apm_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"apm",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(apmdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,apm_drvinit,NULL)
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 2b286b4926dd..d1167dd28eb0 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -13,7 +13,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.16 1995/11/28 09:44:42 julian Exp $
+ *	$Id: apm.c,v 1.17 1995/11/29 10:47:13 julian Exp $
  */
 
 #include "apm.h"
@@ -1005,8 +1005,8 @@ static void 	apm_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"apm",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(apmdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,apm_drvinit,NULL)
diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c
index 997101d52acc..f66264fe6e6c 100644
--- a/sys/i386/i386/conf.c
+++ b/sys/i386/i386/conf.c
@@ -42,7 +42,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)conf.c	5.8 (Berkeley) 5/12/91
- *	$Id: conf.c,v 1.106 1995/11/11 05:10:48 bde Exp $
+ *	$Id: conf.c,v 1.107 1995/11/29 12:38:29 julian Exp $
  */
 
 #include <sys/param.h>
@@ -60,9 +60,9 @@
 #define NUMBDEV 32
 
 struct bdevsw	bdevsw[NUMBDEV];
-int	nblkdev = NUMBDEV
+int	nblkdev = NUMBDEV;
 struct cdevsw	cdevsw[NUMCDEV];
-int	nchrdev = NUMCDEV
+int	nchrdev = NUMCDEV;
 
 #else /*JREMOD*/
 /* Bogus defines for compatibility. */
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 9b8735d1f954..7f2e4d7902f0 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.34 1995/09/10 21:34:49 bde Exp $
+ *	$Id: cons.c,v 1.35 1995/11/29 10:47:17 julian Exp $
  */
 
 #include <sys/param.h>
@@ -332,8 +332,9 @@ static void 	cn_drvinit(void *unused)
 		cn_devsw_installed = 1;
 #ifdef DEVFS
 	/*                path,name,major,minor,type,uid,gid,perm */
-	x=devfs_add_devsw("/","console",major(dev),0,DV_CHR,0,0,0640);
+		x=devfs_add_devsw("/","console",major(dev),0,DV_CHR,0,0,0640);
 #endif
+	}
 }
 
 SYSINIT(cndev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cn_drvinit,NULL)
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index a0a4f070bf56..a444ed62f3c0 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.19 1995/11/04 16:00:25 markm Exp $
+ *	$Id: mem.c,v 1.20 1995/11/29 10:47:18 julian Exp $
  */
 
 /*
@@ -399,8 +399,9 @@ static void 	mem_drvinit(void *unused)
 		cdevsw_add(&dev,&mem_cdevsw,NULL);
 		mem_devsw_installed = 1;
 #ifdef DEVFS
-	memdevfs_init(dev);
+		memdevfs_init(dev);
 #endif
+	}
 }
 
 SYSINIT(memdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,mem_drvinit,NULL)
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index cd286191bf98..05b168d6feb1 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.6 1995/11/28 09:40:39 julian Exp $
+ * $Id: asc.c,v 1.7 1995/11/29 10:47:24 julian Exp $
  */
 
 #include "asc.h"
@@ -894,8 +894,8 @@ static void 	asc_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"asc",	major(dev_chr),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(ascdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,asc_drvinit,NULL)
diff --git a/sys/i386/isa/b004.c b/sys/i386/isa/b004.c
index b59d9d7365a4..59a25dd2394e 100644
--- a/sys/i386/isa/b004.c
+++ b/sys/i386/isa/b004.c
@@ -660,8 +660,8 @@ static void 	bqu_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"bqu",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(bqudev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bqu_drvinit,NULL)
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 0684d3d97ad8..8a567cadf0ad 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.8 1995/11/28 09:40:48 julian Exp $
+ *	$Id: ctx.c,v 1.9 1995/11/29 10:47:27 julian Exp $
  */
 
 /*
@@ -475,8 +475,8 @@ static void 	ctx_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"ctx",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(ctxdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,ctx_drvinit,NULL)
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index 3a606bcb9f4b..73ad27435c0a 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -992,8 +992,8 @@ static void 	cx_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"cx",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(cxdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cx_drvinit,NULL)
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index c4739ae67c88..9ce995757e4d 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.20 1995/11/28 09:40:56 julian Exp $
+ *	$Id: cy.c,v 1.21 1995/11/29 10:47:35 julian Exp $
  */
 
 #include "cy.h"
@@ -2545,8 +2545,8 @@ static void 	cy_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"cy",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(cydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cy_drvinit,NULL)
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 2e511bf60c96..f5e216ee9035 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -1288,8 +1288,8 @@ static void 	gp_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"gp",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(gpdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,gp_drvinit,NULL)
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index 84a9aa0dbf76..57e52008c2ad 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -806,8 +806,8 @@ static void 	gsc_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"gsc",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(gscdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,gsc_drvinit,NULL)
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index e90e90f1a9e9..25d2311ffc04 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -239,8 +239,8 @@ static void 	joy_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"joy",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(joydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,joy_drvinit,NULL)
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 38e6c62f3146..430be96285d2 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -1131,8 +1131,8 @@ static void 	labpc_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"labpc",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(labpcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,labpc_drvinit,NULL)
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index cea3df6ee022..2f092fa1b027 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.40 1995/11/29 10:17:03 phk Exp $
+ *	$Id: lpt.c,v 1.41 1995/11/29 10:47:43 julian Exp $
  */
 
 /*
@@ -1176,8 +1176,8 @@ static void 	lpt_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"lpt",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(lptdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,lpt_drvinit,NULL)
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 477b9d5fdb14..f4e29fac4bfd 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -2783,8 +2783,8 @@ static void 	matcd_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"matcd",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(matcddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,matcd_drvinit,NULL)
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 4ab0b9c2b7d1..5f7f68b0f61e 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.49 1995/11/28 09:41:22 julian Exp $
+ *	$Id: mcd.c,v 1.50 1995/11/29 10:47:44 julian Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -1703,8 +1703,8 @@ static void 	mcd_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"mcd",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(mcddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,mcd_drvinit,NULL)
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 52195fbdd61a..82411de56d3a 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.16 1995/11/28 09:41:25 julian Exp $
+ * $Id: mse.c,v 1.17 1995/11/29 10:47:46 julian Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -599,8 +599,8 @@ static void 	mse_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"mse",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(msedev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,mse_drvinit,NULL)
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index 81d492eade2c..0ab835582eb9 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c
@@ -491,8 +491,8 @@ static void 	psm_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"psm",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(psmdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,psm_drvinit,NULL)
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index e1d80cb9ddc2..deea59594ca8 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -1526,8 +1526,8 @@ static void 	rc_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"rc",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(rcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,rc_drvinit,NULL)
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 0e2a1309f557..edffabf2111d 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.10 1995/11/28 09:41:36 julian Exp $ */
+/* $Id: scd.c,v 1.11 1995/11/29 10:47:50 julian Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -1563,8 +1563,8 @@ static void 	scd_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"scd",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(scddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,scd_drvinit,NULL)
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 7b58916f7828..1f33ad992578 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.17 1995/11/28 09:41:39 julian Exp $
+ *	$Id: si.c,v 1.18 1995/11/29 10:47:51 julian Exp $
  */
 
 #ifndef lint
@@ -2330,8 +2330,8 @@ static void 	si_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"si",	major(dev_chr),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(sidev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,si_drvinit,NULL)
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 7cabae4b5da4..7692fd16c151 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.120 1995/11/28 09:41:47 julian Exp $
+ *	$Id: sio.c,v 1.121 1995/11/29 10:47:54 julian Exp $
  */
 
 #include "sio.h"
@@ -2589,8 +2589,8 @@ static void 	sio_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"sio",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(siodev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,sio_drvinit,NULL)
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index dd6fe32150f0..087e5ea3306a 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.32 1995/11/29 01:07:52 jkh Exp $
+ * $Id: soundcard.c,v 1.33 1995/11/29 10:48:16 julian Exp $
  */
 
 #include "sound_config.h"
@@ -509,8 +509,8 @@ static void 	snd_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"snd",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(snddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,snd_drvinit,NULL)
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index 610c2208f7d5..dcde2752dadf 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -308,8 +308,8 @@ static void 	spigot_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"spigot",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(spigotdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spigot_drvinit,NULL)
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 620ec9fe30e5..9d45e3361ff0 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.18 1995/11/28 09:41:55 julian Exp $
+ *    $Id: spkr.c,v 1.19 1995/11/29 10:47:57 julian Exp $
  */
 
 #include "speaker.h"
@@ -593,8 +593,8 @@ static void 	spkr_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"spkr",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(spkrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spkr_drvinit,NULL)
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index c67204750500..a72224d89e48 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -1016,8 +1016,8 @@ static void 	tw_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"tw",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(twdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,tw_drvinit,NULL)
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index bb7d4dbea93e..f56dc469f78e 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -1204,8 +1204,8 @@ static void 	wcd_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"wcd",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(wcddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wcd_drvinit,NULL)
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index f55eab674013..af05cebf29d6 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.93 1995/11/28 09:42:03 julian Exp $
+ *	$Id: wd.c,v 1.94 1995/11/29 10:48:01 julian Exp $
  */
 
 /* TODO:
@@ -2158,8 +2158,8 @@ static void 	wd_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"wd",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(wddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wd_drvinit,NULL)
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 6420f4c2d307..7e4a06233551 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.21 1995/11/28 09:42:06 julian Exp $
+ * $Id: wt.c,v 1.22 1995/11/29 10:48:03 julian Exp $
  *
  */
 
@@ -1009,8 +1009,8 @@ static void 	wt_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"wt",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(wtdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wt_drvinit,NULL)
diff --git a/sys/isa/joy.c b/sys/isa/joy.c
index e90e90f1a9e9..25d2311ffc04 100644
--- a/sys/isa/joy.c
+++ b/sys/isa/joy.c
@@ -239,8 +239,8 @@ static void 	joy_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"joy",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(joydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,joy_drvinit,NULL)
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 7cabae4b5da4..7692fd16c151 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.120 1995/11/28 09:41:47 julian Exp $
+ *	$Id: sio.c,v 1.121 1995/11/29 10:47:54 julian Exp $
  */
 
 #include "sio.h"
@@ -2589,8 +2589,8 @@ static void 	sio_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"sio",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(siodev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,sio_drvinit,NULL)
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index f1f5557ab8cc..b4ef0fd1024c 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.14 1995/11/14 08:58:35 phk Exp $
+ * $Id: kern_descrip.c,v 1.15 1995/11/29 10:48:21 julian Exp $
  */
 
 #include <sys/param.h>
@@ -1049,8 +1049,8 @@ static void 	fildesc_drvinit(void *unused)
 			x=devfs_add_devsw("/","stderr",major(dev),2,DV_CHR,
 					0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(fildescdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 902ed4c130ba..668ad9c6d35f 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_lkm.c,v 1.19 1995/11/20 12:06:21 phk Exp $
+ * $Id: kern_lkm.c,v 1.20 1995/11/29 10:48:22 julian Exp $
  */
 
 /*
@@ -1025,8 +1025,8 @@ static void 	lkm_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"lkm",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(lkmdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,lkm_drvinit,NULL)
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 0b9d5da8546f..24af05c524b2 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
- * $Id: subr_log.c,v 1.10 1995/10/29 15:30:59 phk Exp $
+ * $Id: subr_log.c,v 1.11 1995/11/29 10:48:25 julian Exp $
  */
 
 /*
@@ -257,8 +257,8 @@ static void 	log_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"log",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(logdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,log_drvinit,NULL)
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 9b8735d1f954..7f2e4d7902f0 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.34 1995/09/10 21:34:49 bde Exp $
+ *	$Id: cons.c,v 1.35 1995/11/29 10:47:17 julian Exp $
  */
 
 #include <sys/param.h>
@@ -332,8 +332,9 @@ static void 	cn_drvinit(void *unused)
 		cn_devsw_installed = 1;
 #ifdef DEVFS
 	/*                path,name,major,minor,type,uid,gid,perm */
-	x=devfs_add_devsw("/","console",major(dev),0,DV_CHR,0,0,0640);
+		x=devfs_add_devsw("/","console",major(dev),0,DV_CHR,0,0,0640);
 #endif
+	}
 }
 
 SYSINIT(cndev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cn_drvinit,NULL)
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index ad41417ed23f..57e53bdfaee1 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_pty.c,v 1.24 1995/11/04 13:24:55 bde Exp $
+ * $Id: tty_pty.c,v 1.25 1995/11/29 10:48:28 julian Exp $
  */
 
 /*
@@ -768,7 +768,6 @@ static void 	ptc_drvinit(void *unused)
 	if( ! ptc_devsw_installed ) {
 		dev = makedev(CDEV_MAJOR_S,0);
 		cdevsw_add(&dev,&pts_cdevsw,NULL);
-		pts_devsw_installed = 1;
 		dev_c = makedev(CDEV_MAJOR_C,0);
 		cdevsw_add(&dev_c,&ptc_cdevsw,NULL);
 		ptc_devsw_installed = 1;
@@ -778,17 +777,18 @@ static void 	ptc_drvinit(void *unused)
 #undef NPTY
 #define NPTY MAXUNITS
 #endif
-	for ( i = 0 ; i<NPTY ; i++ ) {
-		int x;
+		for ( i = 0 ; i<NPTY ; i++ ) {
+			int x;
 
-		j = i / 16;
-		k = i % 16;
-		sprintf(devname,"pty%c%c",jnames[j],knames[k]);
-		x=devfs_add_devsw("/",devname,major(dev_c),0,DV_CHR,0,0,0600);
-		sprintf(devname,"tty%c%c",jnames[j],knames[k]);
-		x=devfs_add_devsw("/",devname,major(dev),0,DV_CHR,0,0,0600);
-    	}
+			j = i / 16;
+			k = i % 16;
+			sprintf(devname,"pty%c%c",jnames[j],knames[k]);
+			x=devfs_add_devsw("/",devname,major(dev_c),0,DV_CHR,0,0,0600);
+			sprintf(devname,"tty%c%c",jnames[j],knames[k]);
+			x=devfs_add_devsw("/",devname,major(dev),0,DV_CHR,0,0,0600);
+		}
 #endif
+    	}
 }
 
 SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR_C,ptc_drvinit,NULL)
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index c89c975baeff..ec1b9282d679 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -522,8 +522,8 @@ static void 	snp_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"snp",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(snpdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,snp_drvinit,NULL)
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index d0a0c8c233b4..a970e037931b 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.5 1995/05/30 08:06:19 rgrimes Exp $
+ * $Id: tty_tty.c,v 1.6 1995/11/29 10:48:30 julian Exp $
  */
 
 /*
@@ -186,8 +186,8 @@ static void 	ctty_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"tty",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(cttydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,ctty_drvinit,NULL)
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index d6393aa10170..57a6e7d4e05c 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.14 1995/11/20 12:29:05 phk Exp $
+ * $Id: bpf.c,v 1.15 1995/11/29 10:48:44 julian Exp $
  */
 
 #include "bpfilter.h"
@@ -1344,8 +1344,8 @@ static void 	bpf_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"bpf",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(bpfdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bpf_drvinit,NULL)
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index ded3d959c9de..12e3e1a42f6c 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -629,8 +629,8 @@ static void 	tun_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"tun",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(tundev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,tun_drvinit,NULL)
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 6dae40b996c3..8954995d5dfe 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -929,8 +929,8 @@ static void 	crd_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"crd",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(crddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,crd_drvinit,NULL)
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 24186586dbe5..d3210d91a604 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.45 1995/11/20 12:42:25 phk Exp $
+ *      $Id: cd.c,v 1.46 1995/11/29 10:48:55 julian Exp $
  */
 
 #define SPLCD splbio
@@ -1342,8 +1342,8 @@ static void 	cd_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"cd",	major(dev_chr),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(cddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cd_drvinit,NULL)
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index b8edea3ed3a2..b95a87245f88 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -2,7 +2,7 @@
  * Written by grefen@convex.com (probably moved by now)
  * Based on scsi drivers by Julian Elischer (julian@tfs.com)
  *
- *      $Id: ch.c,v 1.22 1995/11/20 12:42:27 phk Exp $
+ *      $Id: ch.c,v 1.23 1995/11/29 10:48:56 julian Exp $
  */
 
 #include	<sys/types.h>
@@ -536,8 +536,8 @@ static void 	ch_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"ch",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(chdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,ch_drvinit,NULL)
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index dca9c6707072..3137a517407d 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: od.c,v 1.3 1995/11/20 12:42:28 phk Exp $
+ *	$Id: od.c,v 1.4 1995/11/29 10:48:57 julian Exp $
  */
 
 /*
@@ -840,8 +840,8 @@ static void 	od_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"od",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(oddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,od_drvinit,NULL)
diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c
index 6d34963db50f..75eb13b3d929 100644
--- a/sys/scsi/pt.c
+++ b/sys/scsi/pt.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pt.c,v 1.6 1995/11/19 22:22:23 dyson Exp $
+ *      $Id: pt.c,v 1.7 1995/11/29 10:48:59 julian Exp $
  */
 
 /*
@@ -283,8 +283,8 @@ static void 	pt_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"pt",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(ptdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,pt_drvinit,NULL)
diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c
index 65cc2f267a0c..42592eb098f0 100644
--- a/sys/scsi/sctarg.c
+++ b/sys/scsi/sctarg.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: sctarg.c,v 1.6 1995/11/21 08:35:49 bde Exp $
+ *      $Id: sctarg.c,v 1.7 1995/11/29 10:49:01 julian Exp $
  */
 
 /*
@@ -300,8 +300,8 @@ static void 	sctarg_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"sctarg",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(sctargdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,sctarg_drvinit,NULL)
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 586812d98f0a..d0a93319e3bb 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.72 1995/11/20 12:42:32 phk Exp $
+ *      $Id: sd.c,v 1.73 1995/11/29 10:49:02 julian Exp $
  */
 
 #define SPLSD splbio
@@ -995,8 +995,8 @@ static void 	sd_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"sd",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(sddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,sd_drvinit,NULL)
diff --git a/sys/scsi/ssc.c b/sys/scsi/ssc.c
index 43a7adbbc397..87f71f7faf81 100644
--- a/sys/scsi/ssc.c
+++ b/sys/scsi/ssc.c
@@ -49,7 +49,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *End copyright
- * $Id: ssc.c,v 1.4 1995/11/04 11:12:41 bde Exp $
+ * $Id: ssc.c,v 1.5 1995/11/29 10:49:03 julian Exp $
  */
 
 #include <sys/types.h>
@@ -156,8 +156,8 @@ static void 	ssc_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"ssc",	major(dev_chr),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(sscdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,ssc_drvinit,NULL)
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 6c7db23c935d..ab4e8c1bb68c 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: st.c,v 1.44 1995/11/20 12:42:34 phk Exp $
+ * $Id: st.c,v 1.45 1995/11/29 10:49:05 julian Exp $
  */
 
 /*
@@ -2110,8 +2110,8 @@ static void 	st_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"rst",	major(dev_chr),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(stdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,st_drvinit,NULL)
diff --git a/sys/scsi/su.c b/sys/scsi/su.c
index 8b9d9c662232..a7dac9498fce 100644
--- a/sys/scsi/su.c
+++ b/sys/scsi/su.c
@@ -44,7 +44,7 @@
  * SUCH DAMAGE.
  *End copyright
  *
- *      $Id: su.c,v 1.6 1995/11/06 00:36:08 bde Exp $
+ *      $Id: su.c,v 1.7 1995/11/29 10:49:06 julian Exp $
  *
  * Tabstops 4
  */
@@ -311,8 +311,8 @@ static void 	su_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"su",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(sudev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,su_drvinit,NULL)
diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c
index ab1e6e1ee196..0cf4cf661581 100644
--- a/sys/scsi/uk.c
+++ b/sys/scsi/uk.c
@@ -2,13 +2,14 @@
  * Driver for a device we can't identify.
  * by Julian Elischer (julian@tfs.com)
  *
- *      $Id: uk.c,v 1.9 1995/05/30 08:13:56 rgrimes Exp $
+ *      $Id: uk.c,v 1.10 1995/11/29 10:49:07 julian Exp $
  *
  * If you find that you are adding any code to this file look closely
  * at putting it in "scsi_driver.c" instead.
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 #ifdef JREMOD
@@ -70,8 +71,8 @@ static void 	uk_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"uk",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(ukdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,uk_drvinit,NULL)
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c
index c0c0afb7fc48..059c7d88ab06 100644
--- a/sys/scsi/worm.c
+++ b/sys/scsi/worm.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: worm.c,v 1.10 1995/11/19 22:22:35 dyson Exp $
+ *      $Id: worm.c,v 1.11 1995/11/29 10:49:07 julian Exp $
  */
 
 /* XXX This is PRELIMINARY.
@@ -394,8 +394,8 @@ static void 	worm_drvinit(void *unused)
 /*	path	name	devsw		minor	type   uid gid perm*/
 	"/",	"rworm",	major(dev),	0,	DV_CHR,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(wormdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,worm_drvinit,NULL)
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 3ce5aa991a54..9feed93e37f7 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.3 (Berkeley) 1/21/94
- * $Id: conf.h,v 1.21 1995/11/05 20:25:59 bde Exp $
+ * $Id: conf.h,v 1.22 1995/11/06 00:36:14 bde Exp $
  */
 
 #ifndef _SYS_CONF_H_
@@ -153,6 +153,12 @@ d_devtotty_t	nodevtotty;
 d_select_t	noselect;
 d_mmap_t	nommap;
 
+#ifdef JREMOD
+/* Bogus defines for compatibility. */
+#define	noioc		noioctl
+#define	nostrat		nostrategy
+#define zerosize	nopsize
+#endif /*JREMOD*/
 /*
  * XXX d_strategy seems to be unused for cdevs that aren't associated with
  * bdevs and called without checking for it being non-NULL for bdevs.
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 3ce5aa991a54..9feed93e37f7 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.3 (Berkeley) 1/21/94
- * $Id: conf.h,v 1.21 1995/11/05 20:25:59 bde Exp $
+ * $Id: conf.h,v 1.22 1995/11/06 00:36:14 bde Exp $
  */
 
 #ifndef _SYS_CONF_H_
@@ -153,6 +153,12 @@ d_devtotty_t	nodevtotty;
 d_select_t	noselect;
 d_mmap_t	nommap;
 
+#ifdef JREMOD
+/* Bogus defines for compatibility. */
+#define	noioc		noioctl
+#define	nostrat		nostrategy
+#define zerosize	nopsize
+#endif /*JREMOD*/
 /*
  * XXX d_strategy seems to be unused for cdevs that aren't associated with
  * bdevs and called without checking for it being non-NULL for bdevs.
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 91c12dae75d0..76f0c2881c49 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.25 1995/11/20 12:19:14 phk Exp $
+ * $Id: vm_swap.c,v 1.26 1995/11/29 10:49:16 julian Exp $
  */
 
 #include <sys/param.h>
@@ -296,8 +296,8 @@ static void 	sw_drvinit(void *unused)
 			x=devfs_add_devsw(
 	"/",	"sw",	major(dev),	0,	DV_BLK,	0,  0, 0600);
 		}
-    	}
 #endif
+    	}
 }
 
 SYSINIT(swdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,sw_drvinit,NULL)