diff --git a/sys/arch/sun68k/sun68k/autoconf.c b/sys/arch/sun68k/sun68k/autoconf.c
index 2131110d3686..eae05580233a 100644
--- a/sys/arch/sun68k/sun68k/autoconf.c
+++ b/sys/arch/sun68k/sun68k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.8 2002/09/27 20:36:42 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.9 2002/10/01 05:20:21 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -113,9 +113,8 @@ cpu_configure()
 static int 	mainbus_match __P((struct device *, struct cfdata *, void *));
 static void	mainbus_attach __P((struct device *, struct device *, void *));
 
-const struct cfattach mainbus_ca = {
-	sizeof(struct device), mainbus_match, mainbus_attach
-};
+CFATTACH_DECL(mainbus, sizeof(struct device),
+    mainbus_match, mainbus_attach, NULL, NULL)
 
 /*
  * Probe for the mainbus; always succeeds.
diff --git a/sys/arch/sun68k/sun68k/vme_sun68k.c b/sys/arch/sun68k/sun68k/vme_sun68k.c
index bec894bf326f..06f90b59c09f 100644
--- a/sys/arch/sun68k/sun68k/vme_sun68k.c
+++ b/sys/arch/sun68k/sun68k/vme_sun68k.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme_sun68k.c,v 1.4 2002/09/27 20:36:43 thorpej Exp $	*/
+/*	$NetBSD: vme_sun68k.c,v 1.5 2002/10/01 05:20:21 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -101,9 +101,8 @@ static int	sun68k_vme_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
 
 paddr_t sun68k_vme_mmap_cookie __P((vme_addr_t, vme_am_t, bus_space_handle_t *));
 
-const struct cfattach sun68kvme_ca = {
-	sizeof(struct sun68kvme_softc), sun68kvme_match, sun68kvme_attach
-};
+CFATTACH_DECL(sun68kvme, sizeof(struct sun68kvme_softc),
+    sun68kvme_match, sun68kvme_attach, NULL, NULL)
 
 /*
  * The VME bus logic on sun68k machines maps DMA requests in the first MB
diff --git a/sys/arch/vax/bi/bi_mainbus.c b/sys/arch/vax/bi/bi_mainbus.c
index 36c6d81f7939..bd95cabc3bc8 100644
--- a/sys/arch/vax/bi/bi_mainbus.c
+++ b/sys/arch/vax/bi/bi_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bi_mainbus.c,v 1.5 2002/09/27 20:36:43 thorpej Exp $	   */
+/*	$NetBSD: bi_mainbus.c,v 1.6 2002/10/01 05:18:59 thorpej Exp $	   */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -46,9 +46,8 @@
 static	int bi_mainbus_match __P((struct device *, struct cfdata *, void *));
 static	void bi_mainbus_attach __P((struct device *, struct device *, void *));
 
-const struct cfattach bi_mainbus_ca = {
-	sizeof(struct bi_softc), bi_mainbus_match, bi_mainbus_attach
-};
+CFATTACH_DECL(bi_mainbus, sizeof(struct bi_softc),
+    bi_mainbus_match, bi_mainbus_attach, NULL, NULL)
 
 extern	struct vax_bus_space vax_mem_bus_space;
 extern	struct vax_bus_dma_tag vax_bus_dma_tag;
diff --git a/sys/arch/vax/bi/bi_nmi.c b/sys/arch/vax/bi/bi_nmi.c
index 6b72f2149da2..a8dcb55870ef 100644
--- a/sys/arch/vax/bi/bi_nmi.c
+++ b/sys/arch/vax/bi/bi_nmi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bi_nmi.c,v 1.2 2002/09/27 20:36:44 thorpej Exp $	   */
+/*	$NetBSD: bi_nmi.c,v 1.3 2002/10/01 05:18:59 thorpej Exp $	   */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -102,6 +102,5 @@ bi_nmi_attach(struct device *parent, struct device *self, void *aux)
 	bi_attach(sc);
 }
 
-const struct cfattach bi_nmi_ca = {
-	sizeof(struct bi_softc), bi_nmi_match, bi_nmi_attach
-};
+CFATTACH_DECL(bi_nmi, sizeof(struct bi_softc),
+    bi_nmi_match, bi_nmi_attach, NULL, NULL)
diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c
index d317a7b787c8..2080dcf64ae2 100644
--- a/sys/arch/vax/if/if_de.c
+++ b/sys/arch/vax/if/if_de.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_de.c,v 1.37 2002/09/27 20:36:45 thorpej Exp $	*/
+/*	$NetBSD: if_de.c,v 1.38 2002/10/01 05:19:00 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -156,9 +156,8 @@ void	de_setaddr __P((u_char *, struct de_softc *));
 void	deintr __P((int));
 
 
-const struct cfattach de_ca = {
-	sizeof(struct de_softc), dematch, deattach
-};
+CFATTACH_DECL(de, sizeof(struct de_softc),
+    dematch, deattach, NULL, NULL)
 
 extern struct cfdriver de_cd;
 
diff --git a/sys/arch/vax/if/if_le.c b/sys/arch/vax/if/if_le.c
index de734703888e..0f17b3d6b6bd 100644
--- a/sys/arch/vax/if/if_le.c
+++ b/sys/arch/vax/if/if_le.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.22 2002/09/27 20:36:46 thorpej Exp $	*/
+/*	$NetBSD: if_le.c,v 1.23 2002/10/01 05:19:00 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -123,9 +123,8 @@ void	lance_copytobuf_gap2 __P((struct lance_softc *, void *, int, int));
 void	lance_copyfrombuf_gap2 __P((struct lance_softc *, void *, int, int));
 void	lance_zerobuf_gap2 __P((struct lance_softc *, int, int));
 
-const struct cfattach le_ibus_ca = {
-	sizeof(struct le_softc), le_ibus_match, le_ibus_attach
-};
+CFATTACH_DECL(le_ibus, sizeof(struct le_softc),
+    le_ibus_match, le_ibus_attach, NULL, NULL)
 
 void
 lewrcsr(ls, port, val)
diff --git a/sys/arch/vax/if/if_le_vsbus.c b/sys/arch/vax/if/if_le_vsbus.c
index bee3fd22e888..0fa90f8f0b06 100644
--- a/sys/arch/vax/if/if_le_vsbus.c
+++ b/sys/arch/vax/if/if_le_vsbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_vsbus.c,v 1.13 2002/09/27 20:36:46 thorpej Exp $	*/
+/*	$NetBSD: if_le_vsbus.c,v 1.14 2002/10/01 05:19:00 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -120,9 +120,8 @@ static	void	le_vsbus_attach __P((struct device *, struct device *, void *));
 static	void	lewrcsr __P((struct lance_softc *, u_int16_t, u_int16_t));
 static	u_int16_t lerdcsr __P((struct lance_softc *, u_int16_t));
 
-const struct cfattach le_vsbus_ca = {
-	sizeof(struct le_softc), le_vsbus_match, le_vsbus_attach
-};
+CFATTACH_DECL(le_vsbus, sizeof(struct le_softc),
+    le_vsbus_match, le_vsbus_attach, NULL, NULL)
 
 static void
 lewrcsr(ls, port, val)
diff --git a/sys/arch/vax/if/if_ze.c b/sys/arch/vax/if/if_ze.c
index fc4b078ddfa1..eb8ca20426af 100644
--- a/sys/arch/vax/if/if_ze.c
+++ b/sys/arch/vax/if/if_ze.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_ze.c,v 1.7 2002/09/27 20:36:47 thorpej Exp $ */
+/*      $NetBSD: if_ze.c,v 1.8 2002/10/01 05:19:00 thorpej Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -70,9 +70,8 @@
 static	int	zematch __P((struct device *, struct cfdata *, void *));
 static	void	zeattach __P((struct device *, struct device *, void *));
 
-const struct cfattach ze_ibus_ca = {
-	sizeof(struct ze_softc), zematch, zeattach
-};
+CFATTACH_DECL(ze_ibus, sizeof(struct ze_softc),
+    zematch, zeattach, NULL, NULL)
 
 /*
  * Check for present SGEC.
diff --git a/sys/arch/vax/mba/hp.c b/sys/arch/vax/mba/hp.c
index 2f6c79d7b88c..6269b42b5511 100644
--- a/sys/arch/vax/mba/hp.c
+++ b/sys/arch/vax/mba/hp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hp.c,v 1.27 2002/09/27 20:36:48 thorpej Exp $ */
+/*	$NetBSD: hp.c,v 1.28 2002/10/01 05:19:00 thorpej Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -82,9 +82,8 @@ void	hpstart(struct mba_device *);
 int	hpattn(struct mba_device *);
 enum	xfer_action hpfinish(struct mba_device *, int, int *);
 
-const struct cfattach hp_ca = {
-	sizeof(struct hp_softc), hpmatch, hpattach
-};
+CFATTACH_DECL(hp, sizeof(struct hp_softc),
+    hpmatch, hpattach, NULL, NULL)
 
 dev_type_open(hpopen);
 dev_type_close(hpclose);
diff --git a/sys/arch/vax/mba/mba.c b/sys/arch/vax/mba/mba.c
index 96544d432e8b..5d9f09819ae7 100644
--- a/sys/arch/vax/mba/mba.c
+++ b/sys/arch/vax/mba/mba.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mba.c,v 1.27 2002/09/27 20:36:48 thorpej Exp $ */
+/*	$NetBSD: mba.c,v 1.28 2002/10/01 05:19:00 thorpej Exp $ */
 /*
  * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -79,13 +79,11 @@ void	mbaqueue(struct mba_device *);
 void	mbastart(struct mba_softc *);
 void	mbamapregs(struct mba_softc *);
 
-const struct cfattach mba_cmi_ca = {
-	sizeof(struct mba_softc), mbamatch, mbaattach
-};
+CFATTACH_DECL(mba_cmi, sizeof(struct mba_softc),
+    mbamatch, mbaattach, NULL, NULL)
 
-const struct cfattach mba_sbi_ca = {
-	sizeof(struct mba_softc), mbamatch, mbaattach
-};
+CFATTACH_DECL(mba_sbi, sizeof(struct mba_softc),
+    mbamatch, mbaattach, NULL, NULL)
 
 #define	MBA_WCSR(reg, val) \
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh, (reg), (val))
diff --git a/sys/arch/vax/uba/ts.c b/sys/arch/vax/uba/ts.c
index 73c6fe7e73d6..d1d1c2038b92 100644
--- a/sys/arch/vax/uba/ts.c
+++ b/sys/arch/vax/uba/ts.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ts.c,v 1.21 2002/09/27 20:36:49 thorpej Exp $ */
+/*	$NetBSD: ts.c,v 1.22 2002/10/01 05:19:01 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -193,9 +193,8 @@ int	tsmatch __P((struct device *, void *, void *));
 void	tsattach __P((struct device *, struct device *, void *));
 void	tsstrategy __P((struct buf *));
 
-const struct cfattach ts_ca = {
-	sizeof(struct ts_softc), tsmatch, tsattach
-};
+CFATTACH_DECL(ts, sizeof(struct ts_softc),
+    tsmatch, tsattach, NULL, NULL)
 
 extern struct cfdriver ts_cd;
 
diff --git a/sys/arch/vax/uba/uba_cmi.c b/sys/arch/vax/uba/uba_cmi.c
index ee8b0b0a68e4..4d204a49fe31 100644
--- a/sys/arch/vax/uba/uba_cmi.c
+++ b/sys/arch/vax/uba/uba_cmi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uba_cmi.c,v 1.8 2002/09/27 20:36:50 thorpej Exp $	   */
+/*	$NetBSD: uba_cmi.c,v 1.9 2002/10/01 05:19:01 thorpej Exp $	   */
 /*
  * Copyright (c) 1996 Jonathan Stone.
  * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
@@ -72,9 +72,8 @@ static	void	dw750_init(struct uba_softc*);
 static	void	dw750_purge(struct uba_softc *, int);
 #endif
 
-const struct cfattach uba_cmi_ca = {
-	sizeof(struct uba_vsoftc), dw750_match, dw750_attach
-};
+CFATTACH_DECL(uba_cmi, sizeof(struct uba_vsoftc),
+    dw750_match, dw750_attach, NULL, NULL)
 
 extern	struct vax_bus_space vax_mem_bus_space;
 
diff --git a/sys/arch/vax/uba/uba_ibus.c b/sys/arch/vax/uba/uba_ibus.c
index 2f3061b47d8e..1f96162b1706 100644
--- a/sys/arch/vax/uba/uba_ibus.c
+++ b/sys/arch/vax/uba/uba_ibus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uba_ibus.c,v 1.5 2002/09/27 20:36:50 thorpej Exp $	   */
+/*	$NetBSD: uba_ibus.c,v 1.6 2002/10/01 05:19:01 thorpej Exp $	   */
 /*
  * Copyright (c) 1996 Jonathan Stone.
  * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
@@ -70,9 +70,8 @@ static	void	qba_attach __P((struct device *, struct device *, void *));
 static	void	qba_beforescan __P((struct uba_softc*));
 static	void	qba_init __P((struct uba_softc*));
 
-const struct cfattach uba_ibus_ca = {
-	sizeof(struct uba_vsoftc), qba_match, qba_attach
-};
+CFATTACH_DECL(uba_ibus, sizeof(struct uba_vsoftc),
+    qba_match, qba_attach, NULL, NULL)
 
 extern	struct vax_bus_space vax_mem_bus_space;
 extern	struct vax_bus_dma_tag vax_bus_dma_tag;
diff --git a/sys/arch/vax/uba/uba_mainbus.c b/sys/arch/vax/uba/uba_mainbus.c
index 4083574437e0..ccf4f9304e4b 100644
--- a/sys/arch/vax/uba/uba_mainbus.c
+++ b/sys/arch/vax/uba/uba_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uba_mainbus.c,v 1.3 2002/09/27 20:36:51 thorpej Exp $	   */
+/*	$NetBSD: uba_mainbus.c,v 1.4 2002/10/01 05:19:01 thorpej Exp $	   */
 /*
  * Copyright (c) 1996 Jonathan Stone.
  * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
@@ -67,9 +67,8 @@ static	void	qba_attach __P((struct device *, struct device *, void *));
 static	void	qba_beforescan __P((struct uba_softc*));
 static	void	qba_init __P((struct uba_softc*));
 
-const struct cfattach uba_mainbus_ca = {
-	sizeof(struct uba_vsoftc), qba_match, qba_attach
-};
+CFATTACH_DECL(uba_mainbus, sizeof(struct uba_vsoftc),
+    qba_match, qba_attach, NULL, NULL)
 
 extern	struct vax_bus_space vax_mem_bus_space;
 
diff --git a/sys/arch/vax/uba/uba_sbi.c b/sys/arch/vax/uba/uba_sbi.c
index 6bd13a05ab44..3cab3cf9cbfb 100644
--- a/sys/arch/vax/uba/uba_sbi.c
+++ b/sys/arch/vax/uba/uba_sbi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uba_sbi.c,v 1.17 2002/09/27 20:36:51 thorpej Exp $	   */
+/*	$NetBSD: uba_sbi.c,v 1.18 2002/10/01 05:19:01 thorpej Exp $	   */
 /*
  * Copyright (c) 1996 Jonathan Stone.
  * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
@@ -99,9 +99,8 @@ static  void	ubaerror(struct uba_softc *, int *, int *);
 static	void	dw780_purge(struct uba_softc *, int);
 #endif
 
-const struct cfattach uba_sbi_ca = {
-	sizeof(struct uba_vsoftc), dw780_match, dw780_attach
-};
+CFATTACH_DECL(uba_sbi, sizeof(struct uba_vsoftc),
+    dw780_match, dw780_attach, NULL, NULL)
 
 static struct evcnt strayint = EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, "uba","stray intr");
 static int strayinit = 0;
diff --git a/sys/arch/vax/vax/autoconf.c b/sys/arch/vax/vax/autoconf.c
index b49c0efd9922..3661f080f1a4 100644
--- a/sys/arch/vax/vax/autoconf.c
+++ b/sys/arch/vax/vax/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.74 2002/09/27 20:36:52 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.75 2002/10/01 05:19:02 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -168,9 +168,8 @@ mainbus_attach(parent, self, hej)
 
 }
 
-const struct cfattach mainbus_ca = {
-	sizeof(struct device), mainbus_match, mainbus_attach
-};
+CFATTACH_DECL(mainbus, sizeof(struct device),
+    mainbus_match, mainbus_attach, NULL, NULL)
 
 #include "sd.h"
 #include "cd.h"
diff --git a/sys/arch/vax/vax/cmi.c b/sys/arch/vax/vax/cmi.c
index a6f5afd9a2fc..79c417969b20 100644
--- a/sys/arch/vax/vax/cmi.c
+++ b/sys/arch/vax/vax/cmi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmi.c,v 1.4 2002/09/27 20:36:52 thorpej Exp $ */
+/*	$NetBSD: cmi.c,v 1.5 2002/10/01 05:19:02 thorpej Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -44,9 +44,8 @@ static	int cmi_print(void *, const char *);
 static	int cmi_match(struct device *, struct cfdata *, void *);
 static	void cmi_attach(struct device *, struct device *, void*);
 
-const struct cfattach cmi_ca = {
-	sizeof(struct device), cmi_match, cmi_attach
-};
+CFATTACH_DECL(cmi, sizeof(struct device),
+    cmi_match, cmi_attach, NULL, NULL)
 
 int
 cmi_print(void *aux, const char *name)
diff --git a/sys/arch/vax/vax/ibus.c b/sys/arch/vax/vax/ibus.c
index e1d5adacd697..54487680492e 100644
--- a/sys/arch/vax/vax/ibus.c
+++ b/sys/arch/vax/vax/ibus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibus.c,v 1.8 2002/09/27 20:36:53 thorpej Exp $ */
+/*	$NetBSD: ibus.c,v 1.9 2002/10/01 05:19:02 thorpej Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -43,9 +43,8 @@ static	int ibus_print(void *, const char *);
 static	int ibus_match(struct device *, struct cfdata *, void *);
 static	void ibus_attach(struct device *, struct device *, void*);
 
-const struct cfattach ibus_ca = {
-	sizeof(struct device), ibus_match, ibus_attach
-};
+CFATTACH_DECL(ibus, sizeof(struct device),
+    ibus_match, ibus_attach, NULL, NULL)
 
 int
 ibus_print(void *aux, const char *name)
diff --git a/sys/arch/vax/vax/ka6400.c b/sys/arch/vax/vax/ka6400.c
index 5f234ed96bd3..5f8e7a355245 100644
--- a/sys/arch/vax/vax/ka6400.c
+++ b/sys/arch/vax/vax/ka6400.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka6400.c,v 1.2 2002/09/27 20:36:53 thorpej Exp $	*/
+/*	$NetBSD: ka6400.c,v 1.3 2002/10/01 05:19:02 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -110,9 +110,8 @@ struct ka6400_softc {
 	int sc_nodeid;		/* CPU node ID */
 };
 
-const struct cfattach cpu_xmi_ca = {
-	sizeof(struct ka6400_softc), ka6400_match, ka6400_attach
-};
+CFATTACH_DECL(cpu_xmi, sizeof(struct ka6400_softc),
+    ka6400_match, ka6400_attach, NULL, NULL)
 
 static int
 ka6400_match(struct device *parent, struct cfdata *cf, void *aux)
@@ -197,9 +196,8 @@ struct mem_xmi_softc {
 	bus_space_handle_t sc_ioh;
 };
 
-const struct cfattach mem_xmi_ca = {
-	sizeof(struct mem_xmi_softc), ms6400_match, ms6400_attach
-};
+CFATTACH_DECL(mem_xmi, sizeof(struct mem_xmi_softc),
+    ms6400_match, ms6400_attach, NULL, NULL)
 
 static int
 ms6400_match(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/vax/vax/ka750.c b/sys/arch/vax/vax/ka750.c
index 33684f999ca3..1bd15d32e8cd 100644
--- a/sys/arch/vax/vax/ka750.c
+++ b/sys/arch/vax/vax/ka750.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka750.c,v 1.32 2002/09/27 20:36:54 thorpej Exp $ */
+/*	$NetBSD: ka750.c,v 1.33 2002/10/01 05:19:02 thorpej Exp $ */
 /*
  * Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -97,9 +97,8 @@ ka750_conf()
 static int ka750_memmatch(struct device  *, struct cfdata *, void *);
 static void ka750_memenable(struct device *, struct device *, void *);
 
-const struct cfattach mem_cmi_ca = {
-	sizeof(struct device), ka750_memmatch, ka750_memenable
-};
+CFATTACH_DECL(mem_cmi, sizeof(struct device),
+    ka750_memmatch, ka750_memenable, NULL, NULL)
 
 int
 ka750_memmatch(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/vax/vax/ka780.c b/sys/arch/vax/vax/ka780.c
index 3297488e22fa..14b017df2875 100644
--- a/sys/arch/vax/vax/ka780.c
+++ b/sys/arch/vax/vax/ka780.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka780.c,v 1.18 2002/09/27 20:36:54 thorpej Exp $ */
+/*	$NetBSD: ka780.c,v 1.19 2002/10/01 05:19:02 thorpej Exp $ */
 /*-
  * Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
  * All rights reserved.
@@ -58,9 +58,8 @@ static	int mem_sbi_match(struct device *, struct cfdata *, void *);
 static	void mem_sbi_attach(struct device *, struct device *, void *);
 static	int getsort(int type);
 
-const struct cfattach mem_sbi_ca = {
-	sizeof(struct mem_softc), mem_sbi_match, mem_sbi_attach
-};
+CFATTACH_DECL(sbi, sizeof(struct mem_softc),
+    mem_sbi_match, mem_sbi_attach, NULL, NULL)
 
 int	
 mem_sbi_match(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/vax/vax/ka820.c b/sys/arch/vax/vax/ka820.c
index 4032fa036cf3..1fce5ca4a3ea 100644
--- a/sys/arch/vax/vax/ka820.c
+++ b/sys/arch/vax/vax/ka820.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka820.c,v 1.32 2002/09/27 20:36:55 thorpej Exp $	*/
+/*	$NetBSD: ka820.c,v 1.33 2002/10/01 05:19:02 thorpej Exp $	*/
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -131,9 +131,8 @@ struct ka820_softc {
 	int sc_binid;		/* CPU node ID */
 };
 
-const struct cfattach cpu_bi_ca = {
-	sizeof(struct ka820_softc), ka820_match, ka820_attach
-};
+CFATTACH_DECL(cpu_bi, sizeof(struct ka820_softc),
+    ka820_match, ka820_attach, NULL, NULL)
 
 #ifdef notyet
 extern struct pte BRAMmap[];
@@ -304,9 +303,8 @@ struct mem_bi_softc {
 	bus_space_handle_t sc_ioh;
 };
 
-const struct cfattach mem_bi_ca = {
-	sizeof(struct mem_bi_softc), ms820_match, ms820_attach
-};
+CFATTACH_DECL(mem_bi, sizeof(struct mem_bi_softc),
+    ms820_match, ms820_attach, NULL, NULL)
 
 static int
 ms820_match(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/vax/vax/ka860.c b/sys/arch/vax/vax/ka860.c
index adf277d364c5..2a4868f12cb9 100644
--- a/sys/arch/vax/vax/ka860.c
+++ b/sys/arch/vax/vax/ka860.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka860.c,v 1.18 2002/09/27 20:36:56 thorpej Exp $	*/
+/*	$NetBSD: ka860.c,v 1.19 2002/10/01 05:19:02 thorpej Exp $	*/
 /*
  * Copyright (c) 1986, 1988 Regents of the University of California.
  * All rights reserved.
@@ -346,9 +346,8 @@ static	int abus_print __P((void *, const char *));
 static  int abus_match __P((struct device *, struct cfdata *, void *));
 static  void abus_attach __P((struct device *, struct device *, void*));
 
-const struct cfattach abus_ca = {
-        sizeof(struct device), abus_match, abus_attach
-};
+CFATTACH_DECL(abus, sizeof(struct device),
+    abus_match, abus_attach, NULL, NULL)
 
 /*
  * Abus is the master bus on VAX 8600.
diff --git a/sys/arch/vax/vax/ka88.c b/sys/arch/vax/vax/ka88.c
index 12a1f66ff14b..842a958b7622 100644
--- a/sys/arch/vax/vax/ka88.c
+++ b/sys/arch/vax/vax/ka88.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka88.c,v 1.3 2002/09/27 20:36:56 thorpej Exp $	*/
+/*	$NetBSD: ka88.c,v 1.4 2002/10/01 05:19:02 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -155,9 +155,8 @@ ka88_attach(struct device *parent, struct device *self, void *aux)
 	curcpu()->ci_dev = self;
 }
 
-const struct cfattach cpu_nmi_ca = {
-	sizeof(struct ka88_softc), ka88_match, ka88_attach
-};
+CFATTACH_DECL(cpu_nmi, sizeof(struct ka88_softc),
+    ka88_match, ka88_attach, NULL, NULL)
 
 struct mem_nmi_softc {
 	struct device sc_dev;
@@ -184,9 +183,8 @@ ms88_attach(struct device *parent, struct device *self, void *aux)
 	printf("\n");
 }
 
-const struct cfattach mem_nmi_ca = {
-	sizeof(struct mem_nmi_softc), ms88_match, ms88_attach
-};
+CFATTACH_DECL(mem_nmi, sizeof(struct mem_nmi_softc),
+    ms88_match, ms88_attach, NULL, NULL)
 
 static void
 ka88_badaddr(void)
diff --git a/sys/arch/vax/vax/nmi_mainbus.c b/sys/arch/vax/vax/nmi_mainbus.c
index 3355b10b1c7b..caa3bdcc6a21 100644
--- a/sys/arch/vax/vax/nmi_mainbus.c
+++ b/sys/arch/vax/vax/nmi_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nmi_mainbus.c,v 1.2 2002/09/27 20:36:56 thorpej Exp $	   */
+/*	$NetBSD: nmi_mainbus.c,v 1.3 2002/10/01 05:19:03 thorpej Exp $	   */
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -118,6 +118,5 @@ nmi_mainbus_attach(struct device *parent, struct device *self, void *aux)
 	}
 }
 
-const struct cfattach nmi_mainbus_ca = {
-	sizeof(struct device), nmi_mainbus_match, nmi_mainbus_attach
-};
+CFATTACH_DECL(nmi_mainbus, sizeof(struct device),
+    nmi_mainbus_match, nmi_mainbus_attach, NULL, NULL)
diff --git a/sys/arch/vax/vax/sbi.c b/sys/arch/vax/vax/sbi.c
index e9b5145887d8..69c0c36d393d 100644
--- a/sys/arch/vax/vax/sbi.c
+++ b/sys/arch/vax/vax/sbi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbi.c,v 1.24 2002/09/27 20:36:57 thorpej Exp $ */
+/*	$NetBSD: sbi.c,v 1.25 2002/10/01 05:19:03 thorpej Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -127,10 +127,8 @@ sbi_attach(struct device *parent, struct device *self, void *aux)
 	}
 }
 
-const struct cfattach sbi_mainbus_ca = {
-	sizeof(struct device), sbi_match, sbi_attach
-};
+CFATTACH_DECL(sbi_mainbus, sizeof(struct device),
+    sbi_match, sbi_attach, NULL, NULL)
 
-const struct cfattach sbi_abus_ca = {
-	sizeof(struct device), sbi_match_abus, sbi_attach
-};
+CFATTACH_DECL(sbi_abus, sizeof(struct device),
+    sbi_match_abus, sbi_attach, NULL, NULL)
diff --git a/sys/arch/vax/vax/xmi_mainbus.c b/sys/arch/vax/vax/xmi_mainbus.c
index a17fc065fec7..d7b60b77c8dc 100644
--- a/sys/arch/vax/vax/xmi_mainbus.c
+++ b/sys/arch/vax/vax/xmi_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xmi_mainbus.c,v 1.2 2002/09/27 20:36:58 thorpej Exp $	   */
+/*	$NetBSD: xmi_mainbus.c,v 1.3 2002/10/01 05:19:03 thorpej Exp $	   */
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -45,9 +45,8 @@
 static	int xmi_mainbus_match __P((struct device *, struct cfdata *, void *));
 static	void xmi_mainbus_attach __P((struct device *, struct device *, void *));
 
-const struct cfattach xmi_mainbus_ca = {
-	sizeof(struct xmi_softc), xmi_mainbus_match, xmi_mainbus_attach
-};
+CFATTACH_DECL(xmi_mainbus, sizeof(struct xmi_softc),
+    xmi_mainbus_match, xmi_mainbus_attach, NULL, NULL)
 
 extern	struct vax_bus_space vax_mem_bus_space;
 extern	struct vax_bus_dma_tag vax_bus_dma_tag;
diff --git a/sys/arch/vax/vsa/asc_vsbus.c b/sys/arch/vax/vsa/asc_vsbus.c
index dfe3bfd6de47..bd312d323233 100644
--- a/sys/arch/vax/vsa/asc_vsbus.c
+++ b/sys/arch/vax/vsa/asc_vsbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: asc_vsbus.c,v 1.26 2002/09/27 20:36:58 thorpej Exp $	*/
+/*	$NetBSD: asc_vsbus.c,v 1.27 2002/10/01 05:19:03 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: asc_vsbus.c,v 1.26 2002/09/27 20:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_vsbus.c,v 1.27 2002/10/01 05:19:03 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -105,9 +105,8 @@ struct asc_vsbus_softc {
 static int asc_vsbus_match(struct device *, struct cfdata *, void *);
 static void asc_vsbus_attach(struct device *, struct device *, void *);
 
-const struct cfattach asc_vsbus_ca = {
-	sizeof(struct asc_vsbus_softc), asc_vsbus_match, asc_vsbus_attach
-};
+CFATTACH_DECL(asc_vsbus, sizeof(struct asc_vsbus_softc),
+    asc_vsbus_match, asc_vsbus_attach, NULL, NULL)
 
 /*
  * Functions and the switch for the MI code
diff --git a/sys/arch/vax/vsa/dz_ibus.c b/sys/arch/vax/vsa/dz_ibus.c
index 1924e0582ab5..f5734a66a60b 100644
--- a/sys/arch/vax/vsa/dz_ibus.c
+++ b/sys/arch/vax/vsa/dz_ibus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dz_ibus.c,v 1.27 2002/09/27 20:36:59 thorpej Exp $ */
+/*	$NetBSD: dz_ibus.c,v 1.28 2002/10/01 05:19:03 thorpej Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -67,9 +67,8 @@ static	void	dz_ibus_attach(struct device *, struct device *, void *);
 
 static	vaddr_t idz_regs; /* Used for console */
 
-const struct cfattach dz_ibus_ca = {
-	sizeof(struct dz_softc), dz_ibus_match, dz_ibus_attach
-};
+CFATTACH_DECL(dz_ibus, sizeof(struct dz_softc),
+    dz_ibus_match, dz_ibus_attach, NULL, NULL)
 
 #define REG(name)     short name; short X##name##X;
 static volatile struct ss_dz {/* base address of DZ-controller: 0x200A0000 */
diff --git a/sys/arch/vax/vsa/dz_vsbus.c b/sys/arch/vax/vsa/dz_vsbus.c
index 4e459fcaae62..0c6fc952024e 100644
--- a/sys/arch/vax/vsa/dz_vsbus.c
+++ b/sys/arch/vax/vsa/dz_vsbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dz_vsbus.c,v 1.27 2002/09/27 20:36:59 thorpej Exp $ */
+/*	$NetBSD: dz_vsbus.c,v 1.28 2002/10/01 05:19:03 thorpej Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -74,9 +74,8 @@ static  void    dz_vsbus_attach(struct device *, struct device *, void *);
 
 static	vaddr_t dz_regs; /* Used for console */
 
-const struct cfattach dz_vsbus_ca = {
-	sizeof(struct dz_softc), dz_vsbus_match, dz_vsbus_attach
-};
+CFATTACH_DECL(dz_vsbus, sizeof(struct dz_softc),
+    dz_vsbus_match, dz_vsbus_attach, NULL, NULL)
 
 #define REG(name)     short name; short X##name##X;
 static volatile struct ss_dz {/* base address of DZ-controller: 0x200A0000 */
diff --git a/sys/arch/vax/vsa/hdc9224.c b/sys/arch/vax/vsa/hdc9224.c
index 0a44d58dfb02..f98a15a14f58 100644
--- a/sys/arch/vax/vsa/hdc9224.c
+++ b/sys/arch/vax/vsa/hdc9224.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hdc9224.c,v 1.21 2002/09/27 20:37:00 thorpej Exp $ */
+/*	$NetBSD: hdc9224.c,v 1.22 2002/10/01 05:19:03 thorpej Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -181,13 +181,11 @@ static	void hdc_writeregs(struct hdcsoftc *);
 static	void hdc_readregs(struct hdcsoftc *);
 static	void hdc_qstart(void *);
  
-const struct cfattach hdc_ca = {
-	sizeof(struct hdcsoftc), hdcmatch, hdcattach
-};
+CFATTACH_DECL(hdc, sizeof(struct hdcsoftc),
+    hdcmatch, hdcattach, NULL, NULL)
 
-const struct cfattach rd_ca = {
-	sizeof(struct rdsoftc), rdmatch, rdattach
-};
+CFATTACH_DECL(rd, sizeof(struct rdsoftc),
+    rdmatch, rdattach, NULL, NULL)
 
 dev_type_open(rdopen);
 dev_type_close(rdclose);
diff --git a/sys/arch/vax/vsa/if_ze_vsbus.c b/sys/arch/vax/vsa/if_ze_vsbus.c
index 490c86313df0..23b51b8892c4 100644
--- a/sys/arch/vax/vsa/if_ze_vsbus.c
+++ b/sys/arch/vax/vsa/if_ze_vsbus.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_ze_vsbus.c,v 1.6 2002/09/27 20:37:01 thorpej Exp $ */
+/*      $NetBSD: if_ze_vsbus.c,v 1.7 2002/10/01 05:19:04 thorpej Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -67,9 +67,8 @@
 static	int	zematch(struct device *, struct cfdata *, void *);
 static	void	zeattach(struct device *, struct device *, void *);
 
-const struct cfattach ze_vsbus_ca = {
-	sizeof(struct ze_softc), zematch, zeattach
-};
+CFATTACH_DECL(ze_vsbus, sizeof(struct ze_softc),
+    zematch, zeattach, NULL, NULL)
 
 /*
  * Check for present SGEC.
diff --git a/sys/arch/vax/vsa/lkc.c b/sys/arch/vax/vsa/lkc.c
index cc3b6f4019c0..4ba1c4cef9ee 100644
--- a/sys/arch/vax/vsa/lkc.c
+++ b/sys/arch/vax/vsa/lkc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lkc.c,v 1.14 2002/09/27 20:37:02 thorpej Exp $ */
+/*	$NetBSD: lkc.c,v 1.15 2002/10/01 05:19:04 thorpej Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -60,9 +60,8 @@ struct  lkc_softc {
 	int	ls_lastchar;	/* last key pressed (for repeat) */
 };
 
-const struct cfattach lkc_ca = {
-	sizeof(struct lkc_softc), lkc_match, lkc_attach,
-};
+CFATTACH_DECL(lkc, sizeof(struct lkc_softc),
+    lkc_match, lkc_attach, NULL, NULL)
 
 int
 lkc_match(parent, cf, aux)
diff --git a/sys/arch/vax/vsa/ncr.c b/sys/arch/vax/vsa/ncr.c
index bb5df1db0ef8..0cf5e9c06366 100644
--- a/sys/arch/vax/vsa/ncr.c
+++ b/sys/arch/vax/vsa/ncr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr.c,v 1.37 2002/09/27 20:37:03 thorpej Exp $	*/
+/*	$NetBSD: ncr.c,v 1.38 2002/10/01 05:19:04 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -114,9 +114,8 @@ static	void si_dma_eop(struct ncr5380_softc *);
 static	void si_dma_stop(struct ncr5380_softc *);
 static	void si_dma_go(void *);
 
-const struct cfattach si_vsbus_ca = {
-	sizeof(struct si_softc), si_vsbus_match, si_vsbus_attach
-};
+CFATTACH_DECL(si_vsbus, sizeof(struct si_softc),
+    si_vsbus_match, si_vsbus_attach, NULL, NULL)
 
 static int
 si_vsbus_match(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/vax/vsa/smg.c b/sys/arch/vax/vsa/smg.c
index 2f6563cdc8eb..d854976998b3 100644
--- a/sys/arch/vax/vsa/smg.c
+++ b/sys/arch/vax/vsa/smg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smg.c,v 1.33 2002/09/27 20:37:04 thorpej Exp $ */
+/*	$NetBSD: smg.c,v 1.34 2002/10/01 05:19:04 thorpej Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -116,9 +116,8 @@ struct	smg_softc {
 	struct	device ss_dev;
 };
 
-const struct cfattach smg_ca = {
-	sizeof(struct smg_softc), smg_match, smg_attach,
-};
+CFATTACH_DECL(smg, sizeof(struct smg_softc),
+    smg_match, smg_attach, NULL, NULL)
 
 static void	smg_cursor(void *, int, int, int);
 static int	smg_mapchar(void *, int, unsigned int *);
diff --git a/sys/arch/vax/vsa/vsbus.c b/sys/arch/vax/vsa/vsbus.c
index 4dc0111079ef..b9d01d9eb94e 100644
--- a/sys/arch/vax/vsa/vsbus.c
+++ b/sys/arch/vax/vsa/vsbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsbus.c,v 1.37 2002/09/27 20:37:05 thorpej Exp $ */
+/*	$NetBSD: vsbus.c,v 1.38 2002/10/01 05:19:04 thorpej Exp $ */
 /*
  * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -97,9 +97,8 @@ static struct vax_bus_dma_tag vsbus_bus_dma_tag = {
 extern struct vax_bus_space vax_mem_bus_space;
 static SIMPLEQ_HEAD(, vsbus_dma) vsbus_dma;
 
-const struct cfattach vsbus_ca = { 
-	sizeof(struct vsbus_softc), vsbus_match, vsbus_attach
-};
+CFATTACH_DECL(vsbus, sizeof(struct vsbus_softc),
+    vsbus_match, vsbus_attach, NULL, NULL)
 
 int
 vsbus_print(aux, name)