diff --git a/sys/dev/eisa/ahb.c b/sys/dev/eisa/ahb.c
index 5e8ff2cefd05..a11a28e10949 100644
--- a/sys/dev/eisa/ahb.c
+++ b/sys/dev/eisa/ahb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahb.c,v 1.36 2002/09/27 20:37:49 thorpej Exp $	*/
+/*	$NetBSD: ahb.c,v 1.37 2002/09/30 21:04:24 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.36 2002/09/27 20:37:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.37 2002/09/30 21:04:24 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -152,9 +152,8 @@ integrate int ahb_init_ecb __P((struct ahb_softc *, struct ahb_ecb *));
 int	ahbmatch __P((struct device *, struct cfdata *, void *));
 void	ahbattach __P((struct device *, struct device *, void *));
 
-const struct cfattach ahb_ca = {
-	sizeof(struct ahb_softc), ahbmatch, ahbattach
-};
+CFATTACH_DECL(ahb, sizeof(struct ahb_softc),
+    ahbmatch, ahbattach, NULL, NULL)
 
 #define	AHB_ABORT_TIMEOUT	2000	/* time to wait for abort (mSec) */
 
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index 29ff3611bae4..cb21df3dd67e 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahc_eisa.c,v 1.22 2002/09/27 20:37:50 thorpej Exp $	*/
+/*	$NetBSD: ahc_eisa.c,v 1.23 2002/09/30 21:04:24 thorpej Exp $	*/
 
 /*
  * Product specific probe and attach routines for:
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.22 2002/09/27 20:37:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.23 2002/09/30 21:04:24 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,9 +60,8 @@ int	ahc_eisa_match __P((struct device *, struct cfdata *, void *));
 void	ahc_eisa_attach __P((struct device *, struct device *, void *));
 
 
-const struct cfattach ahc_eisa_ca = {
-	sizeof(struct ahc_softc), ahc_eisa_match, ahc_eisa_attach
-};
+CFATTACH_DECL(ahc_eisa, sizeof(struct ahc_softc),
+    ahc_eisa_match, ahc_eisa_attach, NULL, NULL)
 
 /*
  * Check the slots looking for a board we recognise
diff --git a/sys/dev/eisa/bha_eisa.c b/sys/dev/eisa/bha_eisa.c
index 268a6834ccb5..e3c238a579a1 100644
--- a/sys/dev/eisa/bha_eisa.c
+++ b/sys/dev/eisa/bha_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bha_eisa.c,v 1.21 2002/09/27 20:37:51 thorpej Exp $	*/
+/*	$NetBSD: bha_eisa.c,v 1.22 2002/09/30 21:04:24 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.21 2002/09/27 20:37:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.22 2002/09/30 21:04:24 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -65,9 +65,8 @@ int	bha_eisa_address __P((bus_space_tag_t, bus_space_handle_t, int *));
 int	bha_eisa_match __P((struct device *, struct cfdata *, void *));
 void	bha_eisa_attach __P((struct device *, struct device *, void *));
 
-const struct cfattach bha_eisa_ca = {
-	sizeof(struct bha_softc), bha_eisa_match, bha_eisa_attach
-};
+CFATTACH_DECL(bha_eisa, sizeof(struct bha_softc),
+    bha_eisa_match, bha_eisa_attach, NULL, NULL)
 
 int
 bha_eisa_address(iot, ioh, portp)
diff --git a/sys/dev/eisa/cac_eisa.c b/sys/dev/eisa/cac_eisa.c
index 35e6246aa085..8d53d498d155 100644
--- a/sys/dev/eisa/cac_eisa.c
+++ b/sys/dev/eisa/cac_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cac_eisa.c,v 1.6 2002/09/27 20:37:51 thorpej Exp $	*/
+/*	$NetBSD: cac_eisa.c,v 1.7 2002/09/30 21:04:24 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.6 2002/09/27 20:37:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.7 2002/09/30 21:04:24 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -96,9 +96,8 @@ void	cac_eisa_l0_intr_enable(struct cac_softc *, int);
 int	cac_eisa_l0_intr_pending(struct cac_softc *);
 void	cac_eisa_l0_submit(struct cac_softc *, struct cac_ccb *);
 
-const struct cfattach cac_eisa_ca = {
-	sizeof(struct cac_softc), cac_eisa_match, cac_eisa_attach
-};
+CFATTACH_DECL(cac_eisa, sizeof(struct cac_softc),
+    cac_eisa_match, cac_eisa_attach, NULL, NULL)
 
 static const struct cac_linkage cac_eisa_l0 = {
 	cac_eisa_l0_completed,
diff --git a/sys/dev/eisa/depca_eisa.c b/sys/dev/eisa/depca_eisa.c
index 33dc0ca5aa6c..cc1f81ce20e0 100644
--- a/sys/dev/eisa/depca_eisa.c
+++ b/sys/dev/eisa/depca_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: depca_eisa.c,v 1.3 2002/09/27 20:37:51 thorpej Exp $	*/
+/*	$NetBSD: depca_eisa.c,v 1.4 2002/09/30 21:04:25 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.3 2002/09/27 20:37:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.4 2002/09/30 21:04:25 thorpej Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -87,9 +87,8 @@ struct depca_eisa_softc {
 	int sc_ist;
 };
 
-const struct cfattach depca_eisa_ca = {
-	sizeof(struct depca_eisa_softc), depca_eisa_match, depca_eisa_attach,
-};
+CFATTACH_DECL(depca_eisa, sizeof(struct depca_eisa_softc),
+    depca_eisa_match, depca_eisa_attach, NULL, NULL)
 
 void	*depca_eisa_intr_establish(struct depca_softc *, struct lance_softc *);
 
diff --git a/sys/dev/eisa/dpt_eisa.c b/sys/dev/eisa/dpt_eisa.c
index 33239429486c..cbdaaf7058e0 100644
--- a/sys/dev/eisa/dpt_eisa.c
+++ b/sys/dev/eisa/dpt_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dpt_eisa.c,v 1.7 2002/09/27 20:37:52 thorpej Exp $	*/
+/*	$NetBSD: dpt_eisa.c,v 1.8 2002/09/30 21:04:25 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@netbsd.org>
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.7 2002/09/27 20:37:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.8 2002/09/30 21:04:25 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -59,9 +59,8 @@ static void	dpt_eisa_attach(struct device *, struct device *, void *);
 static int	dpt_eisa_irq(bus_space_tag_t, bus_space_handle_t, int *);
 static int	dpt_eisa_match(struct device *, struct cfdata *, void *);
 
-const struct cfattach dpt_eisa_ca = {
-	sizeof(struct dpt_softc), dpt_eisa_match, dpt_eisa_attach
-};
+CFATTACH_DECL(dpt_eisa, sizeof(struct dpt_softc),
+    dpt_eisa_match, dpt_eisa_attach, NULL, NULL)
 
 static const char * const dpt_eisa_boards[] = {
 	"DPT2402",
diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c
index a751ee43a8df..8048c0433ec1 100644
--- a/sys/dev/eisa/eisa.c
+++ b/sys/dev/eisa/eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: eisa.c,v 1.28 2002/09/27 20:37:52 thorpej Exp $	*/
+/*	$NetBSD: eisa.c,v 1.29 2002/09/30 21:04:25 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.28 2002/09/27 20:37:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.29 2002/09/30 21:04:25 thorpej Exp $");
 
 #include "opt_eisaverbose.h"
 
@@ -56,9 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.28 2002/09/27 20:37:52 thorpej Exp $");
 int	eisamatch(struct device *, struct cfdata *, void *);
 void	eisaattach(struct device *, struct device *, void *);
 
-const struct cfattach eisa_ca = {
-	sizeof(struct device), eisamatch, eisaattach
-};
+CFATTACH_DECL(eisa, sizeof(struct device),
+    eisamatch, eisaattach, NULL, NULL)
 
 int	eisasubmatch(struct device *, struct cfdata *, void *);
 int	eisaprint(void *, const char *);
diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c
index b66f9a6b15b4..8966f567a962 100644
--- a/sys/dev/eisa/if_ep_eisa.c
+++ b/sys/dev/eisa/if_ep_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ep_eisa.c,v 1.25 2002/09/27 20:37:53 thorpej Exp $	*/
+/*	$NetBSD: if_ep_eisa.c,v 1.26 2002/09/30 21:04:25 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.25 2002/09/27 20:37:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.26 2002/09/30 21:04:25 thorpej Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -126,9 +126,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.25 2002/09/27 20:37:53 thorpej Exp
 int ep_eisa_match __P((struct device *, struct cfdata *, void *));
 void ep_eisa_attach __P((struct device *, struct device *, void *));
 
-const struct cfattach ep_eisa_ca = {
-	sizeof(struct ep_softc), ep_eisa_match, ep_eisa_attach
-};
+CFATTACH_DECL(ep_eisa, sizeof(struct ep_softc),
+    ep_eisa_match, ep_eisa_attach, NULL, NULL)
 
 /* XXX move these somewhere else */
 /* While attaching we need a few special EISA registers of the card,
diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c
index d72a4b615f01..339f3bd3b655 100644
--- a/sys/dev/eisa/if_fea.c
+++ b/sys/dev/eisa/if_fea.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fea.c,v 1.26 2002/09/27 20:37:53 thorpej Exp $	*/
+/*	$NetBSD: if_fea.c,v 1.27 2002/09/30 21:04:25 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.26 2002/09/27 20:37:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.27 2002/09/30 21:04:25 thorpej Exp $");
 
 #include "opt_inet.h"
 
@@ -528,7 +528,6 @@ pdq_eisa_attach(
 	printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr);
 }
 
-const struct cfattach fea_ca = {
-    sizeof(pdq_softc_t), pdq_eisa_match, pdq_eisa_attach
-};
+CFATTACH_DECL(fea, sizeof(pdq_softc_t),
+    pdq_eisa_match, pdq_eisa_attach, NULL, NULL)
 #endif
diff --git a/sys/dev/eisa/if_tlp_eisa.c b/sys/dev/eisa/if_tlp_eisa.c
index fb9c82e8c16d..79135e875051 100644
--- a/sys/dev/eisa/if_tlp_eisa.c
+++ b/sys/dev/eisa/if_tlp_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tlp_eisa.c,v 1.9 2002/09/27 20:37:54 thorpej Exp $	*/
+/*	$NetBSD: if_tlp_eisa.c,v 1.10 2002/09/30 21:04:26 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.9 2002/09/27 20:37:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.10 2002/09/30 21:04:26 thorpej Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -121,9 +121,8 @@ struct tulip_eisa_softc {
 int	tlp_eisa_match __P((struct device *, struct cfdata *, void *));
 void	tlp_eisa_attach __P((struct device *, struct device *, void *));
 
-const struct cfattach tlp_eisa_ca = {
-	sizeof(struct tulip_eisa_softc), tlp_eisa_match, tlp_eisa_attach,
-};
+CFATTACH_DECL(tlp_eisa, sizeof(struct tulip_eisa_softc),
+    tlp_eisa_match, tlp_eisa_attach, NULL, NULL)
 
 const int tlp_eisa_irqs[] = { 5, 9, 10, 11 };
 
diff --git a/sys/dev/eisa/mlx_eisa.c b/sys/dev/eisa/mlx_eisa.c
index 2ffee94319a8..602787b61056 100644
--- a/sys/dev/eisa/mlx_eisa.c
+++ b/sys/dev/eisa/mlx_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mlx_eisa.c,v 1.9 2002/09/27 20:37:54 thorpej Exp $	*/
+/*	$NetBSD: mlx_eisa.c,v 1.10 2002/09/30 21:04:26 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.9 2002/09/27 20:37:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.10 2002/09/30 21:04:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,9 +73,8 @@ static int	mlx_v1_fw_handshake(struct mlx_softc *, int *, int *, int *);
 static int	mlx_v1_reset(struct mlx_softc *);
 #endif
 
-const struct cfattach mlx_eisa_ca = {
-	sizeof(struct mlx_softc), mlx_eisa_match, mlx_eisa_attach
-};
+CFATTACH_DECL(mlx_eisa, sizeof(struct mlx_softc),
+    mlx_eisa_match, mlx_eisa_attach, NULL, NULL)
 
 struct mlx_eisa_prod {
 	const char	*mp_idstr;
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index a7710545dac2..3c7affb30a8c 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uha_eisa.c,v 1.19 2002/09/27 20:37:54 thorpej Exp $	*/
+/*	$NetBSD: uha_eisa.c,v 1.20 2002/09/30 21:04:26 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.19 2002/09/27 20:37:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.20 2002/09/30 21:04:26 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -67,9 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.19 2002/09/27 20:37:54 thorpej Exp $"
 int	uha_eisa_match __P((struct device *, struct cfdata *, void *));
 void	uha_eisa_attach __P((struct device *, struct device *, void *));
 
-const struct cfattach uha_eisa_ca = {
-	sizeof(struct uha_softc), uha_eisa_match, uha_eisa_attach
-};
+CFATTACH_DECL(uha_eisa, sizeof(struct uha_softc),
+    uha_eisa_match, uha_eisa_attach, NULL, NULL)
 
 #ifndef	DDB
 #define Debugger() panic("should call debugger here (uha_eisa.c)")
diff --git a/sys/dev/hpc/bivideo.c b/sys/dev/hpc/bivideo.c
index bfadd851d3e3..cc2a8504848b 100644
--- a/sys/dev/hpc/bivideo.c
+++ b/sys/dev/hpc/bivideo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bivideo.c,v 1.15 2002/09/27 20:37:55 thorpej Exp $	*/
+/*	$NetBSD: bivideo.c,v 1.16 2002/09/30 21:09:34 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.15 2002/09/27 20:37:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.16 2002/09/30 21:09:34 thorpej Exp $");
 
 #define FBDEBUG
 static const char _copyright[] __attribute__ ((unused)) =
@@ -122,9 +122,9 @@ void	bivideo_set_contrast(struct bivideo_softc *, int);
 /*
  *  static variables
  */
-const struct cfattach bivideo_ca = {
-	sizeof(struct bivideo_softc), bivideomatch, bivideoattach,
-};
+CFATTACH_DECL(bivideo, sizeof(struct bivideo_softc),
+    bivideomatch, bivideoattach, NULL, NULL)
+
 struct hpcfb_accessops bivideo_ha = {
 	bivideo_ioctl, bivideo_mmap
 };
diff --git a/sys/dev/hpc/btnmgr.c b/sys/dev/hpc/btnmgr.c
index 733e78a48ef2..6e54c710ebe6 100644
--- a/sys/dev/hpc/btnmgr.c
+++ b/sys/dev/hpc/btnmgr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: btnmgr.c,v 1.8 2002/09/27 20:37:56 thorpej Exp $	*/
+/*	$NetBSD: btnmgr.c,v 1.9 2002/09/30 21:09:35 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.8 2002/09/27 20:37:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.9 2002/09/30 21:09:35 thorpej Exp $");
 
 #define BTNMGRDEBUG
 
@@ -89,9 +89,8 @@ static int btnmgr_hook(void *, int, long, void *);
 /*
  * global/static data
  */
-const struct cfattach btnmgr_ca = {
-	sizeof(struct btnmgr_softc), btnmgrmatch, btnmgrattach
-};
+CFATTACH_DECL(btnmgr, sizeof(struct btnmgr_softc),
+    btnmgrmatch, btnmgrattach, NULL, NULL)
 
 #ifdef notyet
 dev_type_open(btnmgropen);
diff --git a/sys/dev/hpc/button.c b/sys/dev/hpc/button.c
index b9363cef0222..df782eec12e0 100644
--- a/sys/dev/hpc/button.c
+++ b/sys/dev/hpc/button.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: button.c,v 1.7 2002/09/27 20:37:56 thorpej Exp $	*/
+/*	$NetBSD: button.c,v 1.8 2002/09/30 21:09:35 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.7 2002/09/27 20:37:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.8 2002/09/30 21:09:35 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,9 +67,8 @@ static void	button_attach(struct device *, struct device *, void *);
 static int	button_intr(void *);
 static int	button_state(void *, int, long, void *);
 
-const struct cfattach button_ca = {
-	sizeof(struct button_softc), button_match, button_attach
-};
+CFATTACH_DECL(button, sizeof(struct button_softc),
+    button_match, button_attach, NULL, NULL)
 
 int
 button_match(struct device *parent, struct cfdata *match, void *aux)
diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c
index e59601798339..5c6793d0cc68 100644
--- a/sys/dev/hpc/hpcfb.c
+++ b/sys/dev/hpc/hpcfb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpcfb.c,v 1.24 2002/09/27 20:37:57 thorpej Exp $	*/
+/*	$NetBSD: hpcfb.c,v 1.25 2002/09/30 21:09:35 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999
@@ -43,13 +43,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.24 2002/09/27 20:37:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.25 2002/09/30 21:09:35 thorpej Exp $");
 
 #define FBDEBUG
 static const char _copyright[] __attribute__ ((unused)) =
     "Copyright (c) 1999 Shin Takemura.  All rights reserved.";
 static const char _rcsid[] __attribute__ ((unused)) =
-    "$NetBSD: hpcfb.c,v 1.24 2002/09/27 20:37:57 thorpej Exp $";
+    "$NetBSD: hpcfb.c,v 1.25 2002/09/30 21:09:35 thorpej Exp $";
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -237,9 +237,8 @@ struct wsdisplay_emulops hpcfb_emulops = {
 /*
  *  static variables
  */
-const struct cfattach hpcfb_ca = {
-	sizeof(struct hpcfb_softc), hpcfbmatch, hpcfbattach,
-};
+CFATTACH_DECL(hpcfb, sizeof(struct hpcfb_softc),
+    hpcfbmatch, hpcfbattach, NULL, NULL)
 
 struct wsscreen_descr hpcfb_stdscreen = {
 	"std",
diff --git a/sys/dev/hpc/hpcin.c b/sys/dev/hpc/hpcin.c
index d59e698ffebc..91da4b85a3d0 100644
--- a/sys/dev/hpc/hpcin.c
+++ b/sys/dev/hpc/hpcin.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpcin.c,v 1.6 2002/09/27 20:37:57 thorpej Exp $	*/
+/*	$NetBSD: hpcin.c,v 1.7 2002/09/30 21:09:35 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.6 2002/09/27 20:37:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.7 2002/09/30 21:09:35 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -72,9 +72,8 @@ struct hpcin_softc {
 #define sc_off		sc_hma.hma_off
 #define sc_connect	sc_hma.hma_connect
 
-const struct cfattach hpcin_ca = {
-	sizeof(struct hpcin_softc), hpcin_match, hpcin_attach
-};
+CFATTACH_DECL(hpcin, sizeof(struct hpcin_softc),
+    hpcin_match, hpcin_attach, NULL, NULL)
 
 int
 hpcin_match(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/dev/hpc/hpcioman.c b/sys/dev/hpc/hpcioman.c
index 39cc28273789..4bc7ba609f16 100644
--- a/sys/dev/hpc/hpcioman.c
+++ b/sys/dev/hpc/hpcioman.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpcioman.c,v 1.7 2002/09/27 20:37:58 thorpej Exp $ */
+/*	$NetBSD: hpcioman.c,v 1.8 2002/09/30 21:09:35 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.7 2002/09/27 20:37:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.8 2002/09/30 21:09:35 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,9 +62,8 @@ struct hpcioman_softc {
 	struct device sc_dev;
 };
 
-const struct cfattach hpcioman_ca = {
-	sizeof(struct hpcioman_softc), hpcioman_match, hpcioman_attach
-};
+CFATTACH_DECL(hpcioman, sizeof(struct hpcioman_softc),
+    hpcioman_match, hpcioman_attach, NULL, NULL)
 
 int
 hpcioman_match(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/dev/hpc/hpckbd.c b/sys/dev/hpc/hpckbd.c
index cf4a6d7982be..70d1709eb0bf 100644
--- a/sys/dev/hpc/hpckbd.c
+++ b/sys/dev/hpc/hpckbd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpckbd.c,v 1.8 2002/09/27 20:37:58 thorpej Exp $ */
+/*	$NetBSD: hpckbd.c,v 1.9 2002/09/30 21:09:35 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.8 2002/09/27 20:37:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.9 2002/09/30 21:09:35 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -112,9 +112,8 @@ void	hpckbd_keymap_setup(struct hpckbd_core *, const keysym_t *, int);
 int	__hpckbd_input(void *, int, int);
 void	__hpckbd_input_hook(void*);
 
-const struct cfattach hpckbd_ca = {
-	sizeof(struct hpckbd_softc), hpckbd_match, hpckbd_attach
-};
+CFATTACH_DECL(hpckbd, sizeof(struct hpckbd_softc),
+    hpckbd_match, hpckbd_attach, NULL, NULL)
 
 /* wskbd accessopts */
 int	hpckbd_enable(void *, int);
diff --git a/sys/dev/hpc/hpcout.c b/sys/dev/hpc/hpcout.c
index ff6efe95f779..4529e6a59091 100644
--- a/sys/dev/hpc/hpcout.c
+++ b/sys/dev/hpc/hpcout.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpcout.c,v 1.5 2002/09/27 20:37:59 thorpej Exp $	*/
+/*	$NetBSD: hpcout.c,v 1.6 2002/09/30 21:09:35 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.5 2002/09/27 20:37:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.6 2002/09/30 21:09:35 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -69,9 +69,8 @@ struct hpcout_softc {
 #define sc_on		sc_hma.hma_on
 #define sc_off		sc_hma.hma_off
 
-const struct cfattach hpcout_ca = {
-	sizeof(struct hpcout_softc), hpcout_match, hpcout_attach
-};
+CFATTACH_DECL(hpcout, sizeof(struct hpcout_softc),
+    hpcout_match, hpcout_attach, NULL, NULL)
 
 int
 hpcout_match(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/dev/hpc/pwctl.c b/sys/dev/hpc/pwctl.c
index cbfacc355b13..3c1aa566fdb3 100644
--- a/sys/dev/hpc/pwctl.c
+++ b/sys/dev/hpc/pwctl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pwctl.c,v 1.9 2002/09/27 20:38:00 thorpej Exp $	*/
+/*	$NetBSD: pwctl.c,v 1.10 2002/09/30 21:09:36 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999-2001
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.9 2002/09/27 20:38:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.10 2002/09/30 21:09:36 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -85,9 +85,8 @@ static int	pwctl_hook(void *, int, long, void *);
 static int	pwctl_ghook(void *, int, long, void *);
 int	pwctl_hardpower(void *, int, long, void *);
 
-const struct cfattach pwctl_ca = {
-	sizeof(struct pwctl_softc), pwctl_match, pwctl_attach
-};
+CFATTACH_DECL(pwctl, sizeof(struct pwctl_softc),
+    pwctl_match, pwctl_attach, NULL, NULL)
 
 int
 pwctl_match(struct device *parent, struct cfdata *match, void *aux)
diff --git a/sys/dev/i2o/dpti.c b/sys/dev/i2o/dpti.c
index 238ca2a6d809..3321fea765f8 100644
--- a/sys/dev/i2o/dpti.c
+++ b/sys/dev/i2o/dpti.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dpti.c,v 1.6 2002/09/27 20:38:00 thorpej Exp $	*/
+/*	$NetBSD: dpti.c,v 1.7 2002/09/30 21:11:45 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.6 2002/09/27 20:38:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.7 2002/09/30 21:11:45 thorpej Exp $");
 
 #include "opt_i2o.h"
 
@@ -152,9 +152,8 @@ const struct cdevsw dpti_cdevsw = {
 
 extern struct cfdriver dpti_cd;
 
-const struct cfattach dpti_ca = {
-	sizeof(struct dpti_softc), dpti_match, dpti_attach
-};
+CFATTACH_DECL(dpti, sizeof(struct dpti_softc),
+    dpti_match, dpti_attach, NULL, NULL)
 
 int
 dpti_match(struct device *parent, struct cfdata *match, void *aux)
diff --git a/sys/dev/i2o/iopl.c b/sys/dev/i2o/iopl.c
index 46c4f7f80ee7..60b4034b519f 100644
--- a/sys/dev/i2o/iopl.c
+++ b/sys/dev/i2o/iopl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iopl.c,v 1.9 2002/09/27 20:38:01 thorpej Exp $	*/
+/*	$NetBSD: iopl.c,v 1.10 2002/09/30 21:11:45 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopl.c,v 1.9 2002/09/27 20:38:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopl.c,v 1.10 2002/09/30 21:11:45 thorpej Exp $");
 
 #include "opt_i2o.h"
 #include "opt_inet.h"
@@ -130,9 +130,8 @@ static int	iopl_ioctl(struct ifnet *, u_long, caddr_t);
 static void	iopl_start(struct ifnet *);
 static void	iopl_stop(struct ifnet *, int);
 
-const struct cfattach iopl_ca = {
-	sizeof(struct iopl_softc), iopl_match, iopl_attach,
-};
+CFATTACH_DECL(iopl, sizeof(struct iopl_softc),
+    iopl_match, iopl_attach, NULL, NULL)
 
 #ifdef I2OVERBOSE
 static const char * const iopl_errors[] = {
diff --git a/sys/dev/i2o/iopsp.c b/sys/dev/i2o/iopsp.c
index c5dcf038fe9f..d1a3891532fd 100644
--- a/sys/dev/i2o/iopsp.c
+++ b/sys/dev/i2o/iopsp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iopsp.c,v 1.14 2002/09/27 20:38:02 thorpej Exp $	*/
+/*	$NetBSD: iopsp.c,v 1.15 2002/09/30 21:11:46 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.14 2002/09/27 20:38:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.15 2002/09/30 21:11:46 thorpej Exp $");
 
 #include "opt_i2o.h"
 
@@ -83,9 +83,8 @@ static int	iopsp_reconfig(struct device *);
 static void	iopsp_scsipi_request(struct scsipi_channel *,
 				     scsipi_adapter_req_t, void *);
 
-const struct cfattach iopsp_ca = {
-	sizeof(struct iopsp_softc), iopsp_match, iopsp_attach
-};
+CFATTACH_DECL(iopsp, sizeof(struct iopsp_softc),
+    iopsp_match, iopsp_attach, NULL, NULL)
 
 /*
  * Match a supported device.
diff --git a/sys/dev/i2o/ld_iop.c b/sys/dev/i2o/ld_iop.c
index f359dc44e79e..64a074a9d29b 100644
--- a/sys/dev/i2o/ld_iop.c
+++ b/sys/dev/i2o/ld_iop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld_iop.c,v 1.11 2002/09/27 20:38:02 thorpej Exp $	*/
+/*	$NetBSD: ld_iop.c,v 1.12 2002/09/30 21:11:46 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.11 2002/09/27 20:38:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.12 2002/09/30 21:11:46 thorpej Exp $");
 
 #include "opt_i2o.h"
 #include "rnd.h"
@@ -92,12 +92,8 @@ static int	ld_iop_match(struct device *, struct cfdata *, void *);
 static int	ld_iop_start(struct ld_softc *, struct buf *);
 static void	ld_iop_unconfig(struct ld_iop_softc *, int);
 
-const struct cfattach ld_iop_ca = {
-	sizeof(struct ld_iop_softc),
-	ld_iop_match,
-	ld_iop_attach,
-	ld_iop_detach
-};
+CFATTACH_DECL(ld_iop, sizeof(struct ld_iop_softc),
+    ld_iop_match, ld_iop_attach, ld_iop_detach, NULL)
 
 #ifdef I2OVERBOSE
 static const char * const ld_iop_errors[] = {