diff --git a/sys/arch/arm/footbridge/isa/dsrtc.c b/sys/arch/arm/footbridge/isa/dsrtc.c
index 9e2c1c274900..109d18767a59 100644
--- a/sys/arch/arm/footbridge/isa/dsrtc.c
+++ b/sys/arch/arm/footbridge/isa/dsrtc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dsrtc.c,v 1.3 2002/10/01 04:26:54 thorpej Exp $	*/
+/*	$NetBSD: dsrtc.c,v 1.4 2002/10/02 15:45:10 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 Mark Brinicombe.
@@ -195,7 +195,7 @@ dsrtc_read(arg, rtc)
 
 /* device and attach structures */
 CFATTACH_DECL(dsrtc, sizeof(struct dsrtc_softc),
-    dsrtcmatch, dsrtcattach, NULL, NULL)
+    dsrtcmatch, dsrtcattach, NULL, NULL);
 
 /*
  * dsrtcmatch()
diff --git a/sys/arch/arm/footbridge/isa/sysbeep_isa.c b/sys/arch/arm/footbridge/isa/sysbeep_isa.c
index 515ca7a5ecde..bb32a8f8f7d9 100644
--- a/sys/arch/arm/footbridge/isa/sysbeep_isa.c
+++ b/sys/arch/arm/footbridge/isa/sysbeep_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysbeep_isa.c,v 1.3 2002/10/01 04:26:54 thorpej Exp $	*/
+/*	$NetBSD: sysbeep_isa.c,v 1.4 2002/10/02 15:45:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@ void sysbeep_isa __P((int pitch, int period));
 
 /* device attach structure */
 CFATTACH_DECL(sysbeep_isa, sizeof(struct device),
-    sysbeep_isa_match, sysbeep_isa_attach, NULL, NULL)
+    sysbeep_isa_match, sysbeep_isa_attach, NULL, NULL);
 
 static int ppi_attached;
 static pcppi_tag_t ppicookie;
diff --git a/sys/arch/arm/iomd/beep.c b/sys/arch/arm/iomd/beep.c
index 207a850f1755..aeff9c29940f 100644
--- a/sys/arch/arm/iomd/beep.c
+++ b/sys/arch/arm/iomd/beep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: beep.c,v 1.14 2002/10/01 03:10:12 thorpej Exp $	*/
+/*	$NetBSD: beep.c,v 1.15 2002/10/02 15:45:11 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe
@@ -42,7 +42,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: beep.c,v 1.14 2002/10/01 03:10:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beep.c,v 1.15 2002/10/02 15:45:11 thorpej Exp $");
 
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -89,7 +89,7 @@ void	beepdma		(struct beep_softc *sc, int buf);
 static int sdma_channel;
 
 CFATTACH_DECL(beep, sizeof(struct beep_softc),
-    beepprobe, beepattach, NULL, NULL)
+    beepprobe, beepattach, NULL, NULL);
 
 extern struct cfdriver beep_cd;
 
diff --git a/sys/arch/arm/iomd/console/console.c b/sys/arch/arm/iomd/console/console.c
index 0edf5f71dcd5..dca2c119549d 100644
--- a/sys/arch/arm/iomd/console/console.c
+++ b/sys/arch/arm/iomd/console/console.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: console.c,v 1.6 2002/10/01 04:25:30 thorpej Exp $	*/
+/*	$NetBSD: console.c,v 1.7 2002/10/02 15:45:14 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1995 Melvyn Tang-Richardson
@@ -1243,13 +1243,13 @@ rpcattach(parent, self, aux)
 
 /*
 CFATTACH_DECL(rpc, sizeof(struct device),
-    rpcprobe, rpcattach, NULL, NULL)
+    rpcprobe, rpcattach, NULL, NULL);
 
 extern struct cfdriver rpc_cd;
 */
 
 CFATTACH_DECL(vt, sizeof(struct device),
-    rpcprobe, rpcattach, NULL, NULL)
+    rpcprobe, rpcattach, NULL, NULL);
 
 extern struct terminal_emulator vt220;
 
diff --git a/sys/arch/arm/iomd/console/vidcconsole.c b/sys/arch/arm/iomd/console/vidcconsole.c
index 9c443708fd85..481e2943bb43 100644
--- a/sys/arch/arm/iomd/console/vidcconsole.c
+++ b/sys/arch/arm/iomd/console/vidcconsole.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidcconsole.c,v 1.6 2002/10/01 04:25:30 thorpej Exp $	*/
+/*	$NetBSD: vidcconsole.c,v 1.7 2002/10/02 15:45:14 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -107,7 +107,7 @@ vidcconsole_attach(parent, self, aux)
 }
 
 CFATTACH_DECL(vidcconsole, sizeof (struct vidcconsole_softc),
-    vidcconsole_probe, vidcconsole_attach, NULL, NULL)
+    vidcconsole_probe, vidcconsole_attach, NULL, NULL);
 
 extern struct cfdriver vidcconsole_cd;
 
diff --git a/sys/arch/arm/iomd/iic_iomd.c b/sys/arch/arm/iomd/iic_iomd.c
index 5240855dfe98..52b5a7614d1e 100644
--- a/sys/arch/arm/iomd/iic_iomd.c
+++ b/sys/arch/arm/iomd/iic_iomd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iic_iomd.c,v 1.4 2002/10/01 03:10:13 thorpej Exp $	*/
+/*	$NetBSD: iic_iomd.c,v 1.5 2002/10/02 15:45:11 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -59,7 +59,7 @@ static int  iic_iomd_probe  __P((struct device *, struct cfdata *, void *));
 static void iic_iomd_attach __P((struct device *, struct device *, void *));
 
 CFATTACH_DECL(iic_iomd, sizeof(struct iic_softc),
-    iic_iomd_probe, iic_iomd_attach, NULL, NULL)
+    iic_iomd_probe, iic_iomd_attach, NULL, NULL);
 
 /*
  * iic device probe function
diff --git a/sys/arch/arm/iomd/iomd.c b/sys/arch/arm/iomd/iomd.c
index 802cb2f6c525..7f58d653c4ab 100644
--- a/sys/arch/arm/iomd/iomd.c
+++ b/sys/arch/arm/iomd/iomd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iomd.c,v 1.7 2002/10/01 03:10:13 thorpej Exp $	*/
+/*	$NetBSD: iomd.c,v 1.8 2002/10/02 15:45:12 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996-1997 Mark Brinicombe.
@@ -84,7 +84,7 @@ static void iomdattach	__P((struct device *parent, struct device *self,
 static int iomdprint	__P((void *aux, const char *iomdbus));
 
 CFATTACH_DECL(iomd, sizeof(struct iomd_softc),
-    iomdmatch, iomdattach, NULL, NULL)
+    iomdmatch, iomdattach, NULL, NULL);
 
 extern struct bus_space iomd_bs_tag;
 
diff --git a/sys/arch/arm/iomd/iomd_clock.c b/sys/arch/arm/iomd/iomd_clock.c
index 82f3fad682c0..8007b4538156 100644
--- a/sys/arch/arm/iomd/iomd_clock.c
+++ b/sys/arch/arm/iomd/iomd_clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iomd_clock.c,v 1.9 2002/10/01 03:10:13 thorpej Exp $	*/
+/*	$NetBSD: iomd_clock.c,v 1.10 2002/10/02 15:45:12 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -85,7 +85,7 @@ int clockhandler	__P((void *));
 int statclockhandler	__P((void *));
 
 CFATTACH_DECL(clock, sizeof(struct clock_softc),
-    clockmatch, clockattach, NULL, NULL)
+    clockmatch, clockattach, NULL, NULL);
 
 /*
  * int clockmatch(struct device *parent, void *match, void *aux)
diff --git a/sys/arch/arm/iomd/kbd_iomd.c b/sys/arch/arm/iomd/kbd_iomd.c
index 276e93c48bfa..0e5166c501eb 100644
--- a/sys/arch/arm/iomd/kbd_iomd.c
+++ b/sys/arch/arm/iomd/kbd_iomd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbd_iomd.c,v 1.5 2002/10/01 03:10:13 thorpej Exp $	*/
+/*	$NetBSD: kbd_iomd.c,v 1.6 2002/10/02 15:45:12 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -68,7 +68,7 @@ extern struct kbd_softc *console_kbd;
 /* Device structures */
 
 CFATTACH_DECL(kbd_iomd, sizeof(struct kbd_softc),
-    kbd_iomd_probe, kbd_iomd_attach, NULL, NULL)
+    kbd_iomd_probe, kbd_iomd_attach, NULL, NULL);
 
 static int
 kbd_iomd_probe(parent, cf, aux)
diff --git a/sys/arch/arm/iomd/lmcaudio.c b/sys/arch/arm/iomd/lmcaudio.c
index 5d0c67d7feb7..178fa2cbf666 100644
--- a/sys/arch/arm/iomd/lmcaudio.c
+++ b/sys/arch/arm/iomd/lmcaudio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lmcaudio.c,v 1.9 2002/10/01 03:10:14 thorpej Exp $	*/
+/*	$NetBSD: lmcaudio.c,v 1.10 2002/10/02 15:45:12 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996, Danny C Tsen.
@@ -109,7 +109,7 @@ void lmcaudio_shutdown	__P((void));
 
 
 CFATTACH_DECL(lmcaudio, sizeof(struct lmcaudio_softc),
-    lmcaudio_probe, lmcaudio_attach, NULL, NULL)
+    lmcaudio_probe, lmcaudio_attach, NULL, NULL);
 
 int curr_rate = 11;
 
diff --git a/sys/arch/arm/iomd/opms_iomd.c b/sys/arch/arm/iomd/opms_iomd.c
index ea6d82d7c523..d20b0ba820fb 100644
--- a/sys/arch/arm/iomd/opms_iomd.c
+++ b/sys/arch/arm/iomd/opms_iomd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: opms_iomd.c,v 1.4 2002/10/01 03:10:14 thorpej Exp $	*/
+/*	$NetBSD: opms_iomd.c,v 1.5 2002/10/02 15:45:12 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 D.C. Tsen
@@ -59,7 +59,7 @@ static void opms_iomd_attach    __P((struct device *, struct device *, void *));
 static void opms_iomd_intenable __P((struct opms_softc *sc, int enable));
 
 CFATTACH_DECL(opms_iomd, sizeof(struct opms_softc),
-    opms_iomd_probe, opms_iomd_attach, NULL, NULL)
+    opms_iomd_probe, opms_iomd_attach, NULL, NULL);
 
 static int
 opms_iomd_probe(parent, cf, aux)
diff --git a/sys/arch/arm/iomd/qms_iomd.c b/sys/arch/arm/iomd/qms_iomd.c
index 9e461f80596f..00210c98cf84 100644
--- a/sys/arch/arm/iomd/qms_iomd.c
+++ b/sys/arch/arm/iomd/qms_iomd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: qms_iomd.c,v 1.6 2002/10/01 03:10:14 thorpej Exp $	*/
+/*	$NetBSD: qms_iomd.c,v 1.7 2002/10/02 15:45:12 thorpej Exp $	*/
 
 /*
  * Copyright (c) Scott Stevens 1995 All rights reserved
@@ -58,7 +58,7 @@ static void qms_iomd_attach    __P((struct device *, struct device *, void *));
 static void qms_iomd_intenable __P((struct qms_softc *sc, int enable));
 
 CFATTACH_DECL(qms_iomd, sizeof(struct qms_softc),
-    qms_iomd_probe, qms_iomd_attach, NULL, NULL)
+    qms_iomd_probe, qms_iomd_attach, NULL, NULL);
 
 static int
 qms_iomd_probe(parent, cf, aux)
diff --git a/sys/arch/arm/iomd/rpckbd_iomd.c b/sys/arch/arm/iomd/rpckbd_iomd.c
index 196bcc3dee3d..2b39fa8e86a3 100644
--- a/sys/arch/arm/iomd/rpckbd_iomd.c
+++ b/sys/arch/arm/iomd/rpckbd_iomd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpckbd_iomd.c,v 1.6 2002/10/01 03:10:14 thorpej Exp $	*/
+/*	$NetBSD: rpckbd_iomd.c,v 1.7 2002/10/02 15:45:13 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@ extern struct rpckbd_softc console_kbd;
 /* Device structures */
 
 CFATTACH_DECL(rpckbd_iomd, sizeof(struct rpckbd_softc),
-    rpckbd_iomd_probe, rpckbd_iomd_attach, NULL, NULL)
+    rpckbd_iomd_probe, rpckbd_iomd_attach, NULL, NULL);
 
 static int
 rpckbd_iomd_probe(parent, cf, aux)
diff --git a/sys/arch/arm/iomd/rtc.c b/sys/arch/arm/iomd/rtc.c
index aadaf9d57d94..5e227ed19bbe 100644
--- a/sys/arch/arm/iomd/rtc.c
+++ b/sys/arch/arm/iomd/rtc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtc.c,v 1.7 2002/10/01 22:11:14 bjh21 Exp $	*/
+/*	$NetBSD: rtc.c,v 1.8 2002/10/02 15:45:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -249,7 +249,7 @@ rtc_read(arg, rtc)
 /* device and attach structures */
 
 CFATTACH_DECL(rtc, sizeof(struct rtc_softc),
-    rtcmatch, rtcattach, NULL, NULL)
+    rtcmatch, rtcattach, NULL, NULL);
 
 extern struct cfdriver rtc_cd;
 
diff --git a/sys/arch/arm/iomd/sysbeep_vidc.c b/sys/arch/arm/iomd/sysbeep_vidc.c
index 611bf5aa7c48..ad952024b7b0 100644
--- a/sys/arch/arm/iomd/sysbeep_vidc.c
+++ b/sys/arch/arm/iomd/sysbeep_vidc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysbeep_vidc.c,v 1.6 2002/10/01 03:10:15 thorpej Exp $	*/
+/*	$NetBSD: sysbeep_vidc.c,v 1.7 2002/10/02 15:45:13 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: sysbeep_vidc.c,v 1.6 2002/10/01 03:10:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysbeep_vidc.c,v 1.7 2002/10/02 15:45:13 thorpej Exp $");
 
 #include <sys/systm.h>
 #include <sys/device.h>
@@ -59,7 +59,7 @@ void lmcaudio_beep_generate(void);
 
 /* device attach structure */
 CFATTACH_DECL(sysbeep_vidc, sizeof(struct device),
-    sysbeep_vidc_match, sysbeep_vidc_attach, NULL, NULL)
+    sysbeep_vidc_match, sysbeep_vidc_attach, NULL, NULL);
 
 int
 sysbeep_vidc_match(struct device *parent, struct cfdata *match, void *aux)
diff --git a/sys/arch/arm/iomd/todclock.c b/sys/arch/arm/iomd/todclock.c
index 1f9bbf6f6fe3..8a4141782145 100644
--- a/sys/arch/arm/iomd/todclock.c
+++ b/sys/arch/arm/iomd/todclock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: todclock.c,v 1.6 2002/10/01 03:10:16 thorpej Exp $	*/
+/*	$NetBSD: todclock.c,v 1.7 2002/10/02 15:45:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -47,7 +47,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: todclock.c,v 1.6 2002/10/01 03:10:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: todclock.c,v 1.7 2002/10/02 15:45:13 thorpej Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -94,7 +94,7 @@ static struct todclock_softc *todclock_sc = NULL;
 /* driver and attach structures */
 
 CFATTACH_DECL(todclock, sizeof(struct todclock_softc),
-    todclockmatch, todclockattach, NULL, NULL)
+    todclockmatch, todclockattach, NULL, NULL);
 
 /*
  * int todclockmatch(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/arm/iomd/vidc20.c b/sys/arch/arm/iomd/vidc20.c
index 50ab5c64c93d..5cf297f37978 100644
--- a/sys/arch/arm/iomd/vidc20.c
+++ b/sys/arch/arm/iomd/vidc20.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc20.c,v 1.7 2002/10/01 03:10:16 thorpej Exp $	*/
+/*	$NetBSD: vidc20.c,v 1.8 2002/10/02 15:45:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
@@ -82,7 +82,7 @@ int  vidc_fref = 24000000;
 
 
 CFATTACH_DECL(vidc, sizeof (struct vidc20_softc),
-    vidcmatch, vidcattach, NULL, NULL)
+    vidcmatch, vidcattach, NULL, NULL);
 
 /*
  * vidcmatch()
diff --git a/sys/arch/arm/iomd/vidcaudio.c b/sys/arch/arm/iomd/vidcaudio.c
index b2b900a7371d..1140ab4673ff 100644
--- a/sys/arch/arm/iomd/vidcaudio.c
+++ b/sys/arch/arm/iomd/vidcaudio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidcaudio.c,v 1.12 2002/10/01 03:10:17 thorpej Exp $	*/
+/*	$NetBSD: vidcaudio.c,v 1.13 2002/10/02 15:45:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson
@@ -38,7 +38,7 @@
 
 #include <sys/param.h>	/* proc.h */
 
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.12 2002/10/01 03:10:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.13 2002/10/02 15:45:13 thorpej Exp $");
 
 #include <sys/conf.h>   /* autoconfig functions */
 #include <sys/device.h> /* device calls */
@@ -105,7 +105,7 @@ void vidcaudio_shutdown	__P((void));
 static int sound_dma_intr;
 
 CFATTACH_DECL(vidcaudio, sizeof(struct vidcaudio_softc),
-    vidcaudio_probe, vidcaudio_attach, NULL, NULL)
+    vidcaudio_probe, vidcaudio_attach, NULL, NULL);
 
 int    vidcaudio_query_encoding  __P((void *, struct audio_encoding *));
 int    vidcaudio_set_params	 __P((void *, int, int, struct audio_params *, struct audio_params *));
diff --git a/sys/arch/arm/iomd/vidcvideo.c b/sys/arch/arm/iomd/vidcvideo.c
index f56e6202e56c..da4cc724b360 100644
--- a/sys/arch/arm/iomd/vidcvideo.c
+++ b/sys/arch/arm/iomd/vidcvideo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcvideo.c,v 1.15 2002/10/01 03:10:19 thorpej Exp $ */
+/* $NetBSD: vidcvideo.c,v 1.16 2002/10/02 15:45:14 thorpej Exp $ */
 
 /*
  * Copyright (c) 2001 Reinoud Zandijk
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.15 2002/10/01 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.16 2002/10/02 15:45:14 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -144,7 +144,7 @@ static void vidcvideo_attach __P((struct device *, struct device *, void *));
 
 /* config glue */
 CFATTACH_DECL(vidcvideo, sizeof(struct vidcvideo_softc),
-    vidcvideo_match, vidcvideo_attach, NULL, NULL)
+    vidcvideo_match, vidcvideo_attach, NULL, NULL);
 
 static struct fb_devconfig vidcvideo_console_dc;
 static int vidcvideo_is_console;
diff --git a/sys/arch/arm/iomd/wsqms_iomd.c b/sys/arch/arm/iomd/wsqms_iomd.c
index 75ffa5ee31b2..6dfced357670 100644
--- a/sys/arch/arm/iomd/wsqms_iomd.c
+++ b/sys/arch/arm/iomd/wsqms_iomd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wsqms_iomd.c,v 1.7 2002/10/01 03:10:19 thorpej Exp $	*/
+/*	$NetBSD: wsqms_iomd.c,v 1.8 2002/10/02 15:45:14 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Reinoud Zandijk
@@ -42,7 +42,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: wsqms_iomd.c,v 1.7 2002/10/01 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsqms_iomd.c,v 1.8 2002/10/02 15:45:14 thorpej Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -61,7 +61,7 @@ static int  wsqms_iomd_probe(struct device *, struct cfdata *, void *);
 static void wsqms_iomd_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(wsqms_iomd, sizeof(struct wsqms_softc),
-    wsqms_iomd_probe, wsqms_iomd_attach, NULL, NULL)
+    wsqms_iomd_probe, wsqms_iomd_attach, NULL, NULL);
 
 static int
 wsqms_iomd_probe(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/dreamcast/dev/g2/g2bus.c b/sys/arch/dreamcast/dev/g2/g2bus.c
index 184f14508951..8b37a62c3c93 100644
--- a/sys/arch/dreamcast/dev/g2/g2bus.c
+++ b/sys/arch/dreamcast/dev/g2/g2bus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: g2bus.c,v 1.6 2002/10/01 03:04:43 thorpej Exp $	*/
+/*	$NetBSD: g2bus.c,v 1.7 2002/10/02 15:45:15 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -47,7 +47,7 @@ void	g2busattach(struct device *, struct device *, void *);
 int	g2busprint(void *, const char *);
 
 CFATTACH_DECL(g2bus, sizeof(struct g2bus_softc),
-    g2busmatch, g2busattach, NULL, NULL)
+    g2busmatch, g2busattach, NULL, NULL);
 
 int	g2bussearch(struct device *, struct cfdata *, void *);
 
diff --git a/sys/arch/dreamcast/dev/g2/gapspci.c b/sys/arch/dreamcast/dev/g2/gapspci.c
index fa3f8a778183..20bf4e17c746 100644
--- a/sys/arch/dreamcast/dev/g2/gapspci.c
+++ b/sys/arch/dreamcast/dev/g2/gapspci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gapspci.c,v 1.7 2002/10/02 09:49:38 itohy Exp $	*/
+/*	$NetBSD: gapspci.c,v 1.8 2002/10/02 15:45:16 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -59,7 +59,7 @@ void	gaps_attach(struct device *, struct device *, void *);
 int	gaps_print(void *, const char *);
 
 CFATTACH_DECL(gapspci, sizeof(struct gaps_softc),
-    gaps_match, gaps_attach, NULL, NULL)
+    gaps_match, gaps_attach, NULL, NULL);
 
 int
 gaps_match(struct device *parent, struct cfdata *match, void *aux)
diff --git a/sys/arch/dreamcast/dev/maple/maple.c b/sys/arch/dreamcast/dev/maple/maple.c
index db42a935b85a..85c9b18ce2b9 100644
--- a/sys/arch/dreamcast/dev/maple/maple.c
+++ b/sys/arch/dreamcast/dev/maple/maple.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: maple.c,v 1.18 2002/10/01 03:03:34 thorpej Exp $	*/
+/*	$NetBSD: maple.c,v 1.19 2002/10/02 15:45:16 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -93,7 +93,7 @@ int	maple_internal_ioctl(struct maple_softc *,  int, int, u_long, caddr_t,
 int	maple_polling = 0;	/* Are we polling?  (Debugger mode) */
 
 CFATTACH_DECL(maple, sizeof(struct maple_softc),
-    maplematch, mapleattach, NULL, NULL)
+    maplematch, mapleattach, NULL, NULL);
 
 extern struct cfdriver maple_cd;
 
diff --git a/sys/arch/dreamcast/dev/maple/mkbd.c b/sys/arch/dreamcast/dev/maple/mkbd.c
index 59f1ddae76ed..05dcd8f422b9 100644
--- a/sys/arch/dreamcast/dev/maple/mkbd.c
+++ b/sys/arch/dreamcast/dev/maple/mkbd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkbd.c,v 1.15 2002/10/01 03:03:37 thorpej Exp $	*/
+/*	$NetBSD: mkbd.c,v 1.16 2002/10/02 15:45:16 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -93,7 +93,7 @@ static struct mkbd_softc *mkbd_console_softc = NULL;
 static int mkbd_console_initted = 0;
 
 CFATTACH_DECL(mkbd, sizeof(struct mkbd_softc),
-    mkbdmatch, mkbdattach, NULL, NULL)
+    mkbdmatch, mkbdattach, NULL, NULL);
 
 static int
 mkbdmatch(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/dreamcast/dev/maple/mms.c b/sys/arch/dreamcast/dev/maple/mms.c
index d79eff59ce3a..09a3064b5f95 100644
--- a/sys/arch/dreamcast/dev/maple/mms.c
+++ b/sys/arch/dreamcast/dev/maple/mms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mms.c,v 1.4 2002/10/01 03:03:37 thorpej Exp $	*/
+/*	$NetBSD: mms.c,v 1.5 2002/10/02 15:45:17 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@ int	mms_match(struct device *, struct cfdata *, void *);
 void	mms_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(mms, sizeof(struct mms_softc),
-    mms_match, mms_attach, NULL, NULL)
+    mms_match, mms_attach, NULL, NULL);
 
 int	mms_enable(void *);
 int	mms_ioctl(void *, u_long, caddr_t, int, struct proc *);
diff --git a/sys/arch/evbmips/alchemy/dev/aupcmcia.c b/sys/arch/evbmips/alchemy/dev/aupcmcia.c
index 7fa047705c12..ee755a404c96 100644
--- a/sys/arch/evbmips/alchemy/dev/aupcmcia.c
+++ b/sys/arch/evbmips/alchemy/dev/aupcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aupcmcia.c,v 1.4 2002/10/01 04:21:32 thorpej Exp $ */
+/* $NetBSD: aupcmcia.c,v 1.5 2002/10/02 15:45:17 thorpej Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -46,7 +46,7 @@ static int	aupcmcia_match(struct device *, struct cfdata *, void *);
 static void	aupcmcia_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(aupcmcia, sizeof (struct device),
-    aupcmcia_match, aupcmcia_attach, NULL, NULL)
+    aupcmcia_match, aupcmcia_attach, NULL, NULL);
 
 int
 aupcmcia_match(struct device *parent, struct cfdata *match, void *aux)
diff --git a/sys/arch/evbmips/malta/dev/gt.c b/sys/arch/evbmips/malta/dev/gt.c
index c97deec3cdf8..022b1c54474a 100644
--- a/sys/arch/evbmips/malta/dev/gt.c
+++ b/sys/arch/evbmips/malta/dev/gt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gt.c,v 1.4 2002/10/01 04:23:55 thorpej Exp $	*/
+/*	$NetBSD: gt.c,v 1.5 2002/10/02 15:45:17 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -89,7 +89,7 @@ static void	gt_attach(struct device *, struct device *, void *);
 static int	gt_print(void *aux, const char *pnp);
 
 CFATTACH_DECL(gt, sizeof(struct device),
-    gt_match, gt_attach, NULL, NULL)
+    gt_match, gt_attach, NULL, NULL);
 
 static int
 gt_match(parent, match, aux)
diff --git a/sys/arch/evbmips/malta/dev/mainbus.c b/sys/arch/evbmips/malta/dev/mainbus.c
index e159a65f78f6..42288f361a9c 100644
--- a/sys/arch/evbmips/malta/dev/mainbus.c
+++ b/sys/arch/evbmips/malta/dev/mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.4 2002/10/01 04:23:55 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.5 2002/10/02 15:45:18 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -70,7 +70,7 @@ static int	mainbus_submatch(struct device *, struct cfdata *, void *);
 static int	mainbus_print(void *, const char *);
 
 CFATTACH_DECL(mainbus, sizeof(struct device),
-    mainbus_match, mainbus_attach, NULL, NULL)
+    mainbus_match, mainbus_attach, NULL, NULL);
 
 /* There can be only one. */
 int	mainbus_found;
diff --git a/sys/arch/evbmips/malta/pci/pchb.c b/sys/arch/evbmips/malta/pci/pchb.c
index 425b81e6684f..83a7fcf0b5e1 100644
--- a/sys/arch/evbmips/malta/pci/pchb.c
+++ b/sys/arch/evbmips/malta/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pchb.c,v 1.3 2002/10/01 03:02:07 thorpej Exp $	*/
+/*	$NetBSD: pchb.c,v 1.4 2002/10/02 15:45:18 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -45,7 +45,7 @@ static int	pchb_match(struct device *, struct cfdata *, void *);
 static void	pchb_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(pchb, sizeof(struct device),
-    pchb_match, pchb_attach, NULL, NULL)
+    pchb_match, pchb_attach, NULL, NULL);
 
 static int pcifound = 0;
 
diff --git a/sys/arch/evbmips/malta/pci/pcib.c b/sys/arch/evbmips/malta/pci/pcib.c
index 35cf560bbe58..f8254f82d546 100644
--- a/sys/arch/evbmips/malta/pci/pcib.c
+++ b/sys/arch/evbmips/malta/pci/pcib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.5 2002/10/01 03:02:07 thorpej Exp $	*/
+/*	$NetBSD: pcib.c,v 1.6 2002/10/02 15:45:18 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -133,7 +133,7 @@ static const char *
 		pcib_isa_intr_string(void *, int);
 
 CFATTACH_DECL(pcib, sizeof(struct pcib_softc),
-    pcib_match, pcib_attach, NULL, NULL)
+    pcib_match, pcib_attach, NULL, NULL);
 
 static int
 pcib_match(struct device *parent, struct cfdata *match, void *aux)
diff --git a/sys/arch/hpcmips/dev/apm/apmdev.c b/sys/arch/hpcmips/dev/apm/apmdev.c
index 466af742a5a1..39333ea360e7 100644
--- a/sys/arch/hpcmips/dev/apm/apmdev.c
+++ b/sys/arch/hpcmips/dev/apm/apmdev.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: apmdev.c,v 1.10 2002/10/01 03:00:46 thorpej Exp $ */
+/*	$NetBSD: apmdev.c,v 1.11 2002/10/02 15:45:19 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@ static void	apm_suspend(struct apm_softc *);
 static void	apm_resume(struct apm_softc *, u_int, u_int);
 
 CFATTACH_DECL(apmdev, sizeof(struct apm_softc),
-    apmmatch, apmattach, NULL, NULL)
+    apmmatch, apmattach, NULL, NULL);
 
 extern struct cfdriver apmdev_cd;
 
diff --git a/sys/arch/hpcsh/dev/hd64461/hd64461.c b/sys/arch/hpcsh/dev/hd64461/hd64461.c
index 52e507f1bc23..85b103102a32 100644
--- a/sys/arch/hpcsh/dev/hd64461/hd64461.c
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64461.c,v 1.10 2002/10/01 02:59:57 thorpej Exp $	*/
+/*	$NetBSD: hd64461.c,v 1.11 2002/10/02 15:45:19 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@ STATIC void hd64461_info(void);
 #endif
 
 CFATTACH_DECL(hd64461if, sizeof(struct device),
-    hd64461_match, hd64461_attach, NULL, NULL)
+    hd64461_match, hd64461_attach, NULL, NULL);
 
 int
 hd64461_match(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c b/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
index b07942f8999a..a5ee6efd386a 100644
--- a/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64461pcmcia.c,v 1.19 2002/10/01 02:59:57 thorpej Exp $	*/
+/*	$NetBSD: hd64461pcmcia.c,v 1.20 2002/10/02 15:45:20 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -197,7 +197,7 @@ STATIC int hd64461pcmcia_print(void *, const char *);
 STATIC int hd64461pcmcia_submatch(struct device *, struct cfdata *, void *);
 
 CFATTACH_DECL(hd64461pcmcia, sizeof(struct hd64461pcmcia_softc),
-    hd64461pcmcia_match, hd64461pcmcia_attach, NULL, NULL)
+    hd64461pcmcia_match, hd64461pcmcia_attach, NULL, NULL);
 
 STATIC void hd64461pcmcia_attach_channel(struct hd64461pcmcia_softc *,
     enum controller_channel);
diff --git a/sys/arch/hpcsh/dev/hd64461/hd64461uart.c b/sys/arch/hpcsh/dev/hd64461/hd64461uart.c
index ff4993059934..413c203478bf 100644
--- a/sys/arch/hpcsh/dev/hd64461/hd64461uart.c
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461uart.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64461uart.c,v 1.13 2002/10/01 02:59:57 thorpej Exp $	*/
+/*	$NetBSD: hd64461uart.c,v 1.14 2002/10/02 15:45:20 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@ STATIC int hd64461uart_match(struct device *, struct cfdata *, void *);
 STATIC void hd64461uart_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(hd64461uart, sizeof(struct hd64461uart_softc),
-    hd64461uart_match, hd64461uart_attach, NULL, NULL)
+    hd64461uart_match, hd64461uart_attach, NULL, NULL);
 
 STATIC void hd64461uart_init(void);
 STATIC u_int8_t hd64461uart_read_1(void *, bus_space_handle_t, bus_size_t);
diff --git a/sys/arch/hpcsh/dev/hd64461/hd64461video.c b/sys/arch/hpcsh/dev/hd64461/hd64461video.c
index 59baade76366..bc861d3da6c4 100644
--- a/sys/arch/hpcsh/dev/hd64461/hd64461video.c
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461video.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64461video.c,v 1.15 2002/10/01 02:59:57 thorpej Exp $	*/
+/*	$NetBSD: hd64461video.c,v 1.16 2002/10/02 15:45:20 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@ STATIC void hd64461video_dump(void) __attribute__((__unused__));
 #endif
 
 CFATTACH_DECL(hd64461video, sizeof(struct hd64461video_softc),
-    hd64461video_match, hd64461video_attach, NULL, NULL)
+    hd64461video_match, hd64461video_attach, NULL, NULL);
 
 int hd64461video_ioctl(void *, u_long, caddr_t, int, struct proc *);
 paddr_t hd64461video_mmap(void *, off_t, int);
diff --git a/sys/arch/hpcsh/dev/hd64465/hd64465.c b/sys/arch/hpcsh/dev/hd64465/hd64465.c
index 5b2d28b0e05d..84f22fab5868 100644
--- a/sys/arch/hpcsh/dev/hd64465/hd64465.c
+++ b/sys/arch/hpcsh/dev/hd64465/hd64465.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64465.c,v 1.6 2002/10/01 02:58:08 thorpej Exp $	*/
+/*	$NetBSD: hd64465.c,v 1.7 2002/10/02 15:45:21 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@ STATIC void hd64465_info(void);
 #endif
 
 CFATTACH_DECL(hd64465if, sizeof(struct device),
-    hd64465_match, hd64465_attach)
+    hd64465_match, hd64465_attach);
 
 int
 hd64465_match(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c b/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c
index 71988ab26dcd..6fbdb13452d4 100644
--- a/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c
+++ b/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64465pcmcia.c,v 1.9 2002/10/01 02:58:08 thorpej Exp $	*/
+/*	$NetBSD: hd64465pcmcia.c,v 1.10 2002/10/02 15:45:21 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -181,7 +181,7 @@ STATIC int hd64465pcmcia_print(void *, const char *);
 STATIC int hd64465pcmcia_submatch(struct device *, struct cfdata *, void *);
 
 CFATTACH_DECL(hd64465pcmcia, sizeof(struct hd64465pcmcia_softc),
-    hd64465pcmcia_match, hd64465pcmcia_attach, NULL, NULL)
+    hd64465pcmcia_match, hd64465pcmcia_attach, NULL, NULL);
 
 STATIC void hd64465pcmcia_attach_channel(struct hd64465pcmcia_softc *, int);
 /* hot plug */
diff --git a/sys/arch/hpcsh/dev/hd64465/hd64465uart.c b/sys/arch/hpcsh/dev/hd64465/hd64465uart.c
index dce3bc983c12..4249bfec2267 100644
--- a/sys/arch/hpcsh/dev/hd64465/hd64465uart.c
+++ b/sys/arch/hpcsh/dev/hd64465/hd64465uart.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64465uart.c,v 1.7 2002/10/01 02:58:08 thorpej Exp $	*/
+/*	$NetBSD: hd64465uart.c,v 1.8 2002/10/02 15:45:21 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@ STATIC int hd64465uart_match(struct device *, struct cfdata *, void *);
 STATIC void hd64465uart_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(hd64465uart, sizeof(struct hd64465uart_softc),
-    hd64465uart_match, hd64465uart_attach, NULL, NULL)
+    hd64465uart_match, hd64465uart_attach, NULL, NULL);
 
 STATIC void hd64465uart_init(void);
 STATIC u_int8_t hd64465uart_read_1(void *, bus_space_handle_t, bus_size_t);