diff --git a/sys/arch/arm/omap/obio_ohci.c b/sys/arch/arm/omap/obio_ohci.c
index 96f1e6135e36..b202d142866d 100644
--- a/sys/arch/arm/omap/obio_ohci.c
+++ b/sys/arch/arm/omap/obio_ohci.c
@@ -1,7 +1,7 @@
-/*	$Id: obio_ohci.c,v 1.3 2008/10/24 05:39:00 matt Exp $	*/
+/*	$Id: obio_ohci.c,v 1.4 2008/12/12 17:36:14 matt Exp $	*/
 
 /* adapted from: */
-/*	$NetBSD: obio_ohci.c,v 1.3 2008/10/24 05:39:00 matt Exp $	*/
+/*	$NetBSD: obio_ohci.c,v 1.4 2008/12/12 17:36:14 matt Exp $	*/
 /*	$OpenBSD: pxa2x0_ohci.c,v 1.19 2005/04/08 02:32:54 dlg Exp $ */
 
 /*
@@ -23,7 +23,7 @@
 #include "opt_omap.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.3 2008/10/24 05:39:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -59,7 +59,7 @@ static int	obioohci_detach(struct device *, int);
 void *		obioohci_fake_intr_establish(int (*)(void *), void *);
 void		obioohci_fake_intr(void);
 
-CFATTACH_DECL(obioohci, sizeof(struct obioohci_softc),
+CFATTACH_DECL_NEW(obioohci, sizeof(struct obioohci_softc),
     obioohci_match, obioohci_attach, obioohci_detach, ohci_activate);
 
 static void	obioohci_clkinit(struct obio_attach_args *);
diff --git a/sys/arch/arm/omap/omap2_obio.c b/sys/arch/arm/omap/omap2_obio.c
index e1fc44fe48f5..6bd5af4e26c3 100644
--- a/sys/arch/arm/omap/omap2_obio.c
+++ b/sys/arch/arm/omap/omap2_obio.c
@@ -1,7 +1,7 @@
-/*	$Id: omap2_obio.c,v 1.6 2008/11/21 17:13:07 matt Exp $	*/
+/*	$Id: omap2_obio.c,v 1.7 2008/12/12 17:36:14 matt Exp $	*/
 
 /* adapted from: */
-/*	$NetBSD: omap2_obio.c,v 1.6 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap2_obio.c,v 1.7 2008/12/12 17:36:14 matt Exp $ */
 
 
 /*
@@ -103,7 +103,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.6 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.7 2008/12/12 17:36:14 matt Exp $");
 
 #include "locators.h"
 #include "obio.h"
@@ -383,9 +383,12 @@ obio_attach_critical(struct obio_softc *sc)
 			continue;
 
 		cf = config_search_ia(obio_find, sc->sc_dev, "obio", &oa);
-		if (cf == NULL && critical_devs[i].required)
-			panic("obio_attach_critical: failed to find %s!",
-			    critical_devs[i].name);
+		if (cf == NULL) {
+			if (critical_devs[i].required)
+				panic("obio_attach_critical: failed to find %s!",
+				    critical_devs[i].name);
+			continue;
+		}
 
 		oa.obio_addr = cf->cf_loc[OBIOCF_ADDR];
 		oa.obio_size = cf->cf_loc[OBIOCF_SIZE];
diff --git a/sys/arch/arm/omap/omap_emifs.c b/sys/arch/arm/omap/omap_emifs.c
index 2341f4434402..9518b1d41a5f 100644
--- a/sys/arch/arm/omap/omap_emifs.c
+++ b/sys/arch/arm/omap/omap_emifs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_emifs.c,v 1.3 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap_emifs.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
 
 
 /*
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_emifs.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_emifs.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 
 #include "locators.h"
 
@@ -165,7 +165,7 @@ static const timing_parm_info timing_parms[] = {
 };
 
 /* attach structures */
-CFATTACH_DECL(emifs, sizeof(struct emifs_softc),
+CFATTACH_DECL_NEW(emifs, sizeof(struct emifs_softc),
     emifs_match, emifs_attach, NULL, NULL);
 
 static int emifs_attached;
diff --git a/sys/arch/arm/omap/omap_gpio.c b/sys/arch/arm/omap/omap_gpio.c
index 33add11cdaee..466e7a28c33d 100644
--- a/sys/arch/arm/omap/omap_gpio.c
+++ b/sys/arch/arm/omap/omap_gpio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_gpio.c,v 1.3 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap_gpio.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
 
 /*
  * The OMAP GPIO Controller interface is inspired by pxa2x0_gpio.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_gpio.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_gpio.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,7 +79,7 @@ static void	omapgpio_attach(device_t, device_t, void *);
 
 extern struct cfdriver omapgpio_cd;
 
-CFATTACH_DECL(omapgpio, sizeof(struct omapgpio_softc),
+CFATTACH_DECL_NEW(omapgpio, sizeof(struct omapgpio_softc),
     omapgpio_match, omapgpio_attach, NULL, NULL);
 
 static int	omapgpio_intr(void *);
diff --git a/sys/arch/arm/omap/omap_mputmr.c b/sys/arch/arm/omap/omap_mputmr.c
index 9095b39f9a60..85de2852b51b 100644
--- a/sys/arch/arm/omap/omap_mputmr.c
+++ b/sys/arch/arm/omap/omap_mputmr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_mputmr.c,v 1.4 2008/11/21 17:13:07 matt Exp $	*/
+/*	$NetBSD: omap_mputmr.c,v 1.5 2008/12/12 17:36:14 matt Exp $	*/
 
 /*
  * Based on i80321_timer.c and arch/arm/sa11x0/sa11x0_ost.c
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_mputmr.c,v 1.4 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_mputmr.c,v 1.5 2008/12/12 17:36:14 matt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -139,7 +139,7 @@ static struct omapmputmr_softc *ref_sc = NULL;
 #define MPU_LOAD_TIMER	0x04
 #define MPU_READ_TIMER	0x08
 
-CFATTACH_DECL(omapmputmr, sizeof(struct omapmputmr_softc),
+CFATTACH_DECL_NEW(omapmputmr, sizeof(struct omapmputmr_softc),
     omapmputmr_match, omapmputmr_attach, NULL, NULL);
 
 static int
diff --git a/sys/arch/arm/omap/omap_ocp.c b/sys/arch/arm/omap/omap_ocp.c
index aecf232292d9..ebae0781bc23 100644
--- a/sys/arch/arm/omap/omap_ocp.c
+++ b/sys/arch/arm/omap/omap_ocp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_ocp.c,v 1.3 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap_ocp.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
 
 /*
  * Autoconfiguration support for the Texas Instruments OMAP OCP bus.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_ocp.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_ocp.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 
 #include "locators.h"
 
@@ -126,7 +126,7 @@ static int 	ocp_search(device_t, cfdata_t, const int *, void *);
 static int	ocp_print(void *, const char *);
 
 /* attach structures */
-CFATTACH_DECL(ocp, sizeof(struct ocp_softc),
+CFATTACH_DECL_NEW(ocp, sizeof(struct ocp_softc),
     ocp_match, ocp_attach, NULL, NULL);
 
 static int ocp_attached;
diff --git a/sys/arch/arm/omap/omap_rtc.c b/sys/arch/arm/omap/omap_rtc.c
index a9162eefc9be..4118b25e859b 100644
--- a/sys/arch/arm/omap/omap_rtc.c
+++ b/sys/arch/arm/omap/omap_rtc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_rtc.c,v 1.3 2008/11/21 17:13:07 matt Exp $	*/
+/*	$NetBSD: omap_rtc.c,v 1.4 2008/12/12 17:36:14 matt Exp $	*/
 
 /*
  * OMAP RTC driver, based on i80321_timer.c.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_rtc.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_rtc.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -90,7 +90,7 @@ struct omaprtc_softc {
 	struct todr_chip_handle	sc_todr;
 };
 
-CFATTACH_DECL(omaprtc, sizeof(struct omaprtc_softc),
+CFATTACH_DECL_NEW(omaprtc, sizeof(struct omaprtc_softc),
     omaprtc_match, omaprtc_attach, NULL, NULL);
 
 static int omaprtc_gettime(todr_chip_handle_t, struct clock_ymdhms *);
diff --git a/sys/arch/arm/omap/omap_tipb.c b/sys/arch/arm/omap/omap_tipb.c
index 16e75f10be37..c8b4a9c4844e 100644
--- a/sys/arch/arm/omap/omap_tipb.c
+++ b/sys/arch/arm/omap/omap_tipb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_tipb.c,v 1.3 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap_tipb.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
 
 /*
  * Autoconfiguration support for the Texas Instruments OMAP TIPB.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_tipb.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_tipb.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 
 #include "locators.h"
 
@@ -123,12 +123,11 @@ struct tipb_softc {
 /* prototypes */
 static int	tipb_match(device_t, cfdata_t, void *);
 static void	tipb_attach(device_t, device_t, void *);
-static int 	tipb_search(device_t, cfdata_t,
-			     const int *, void *);
+static int 	tipb_search(device_t, cfdata_t, const int *, void *);
 static int	tipb_print(void *, const char *);
 
 /* attach structures */
-CFATTACH_DECL(tipb, sizeof(struct tipb_softc),
+CFATTACH_DECL_NEW(tipb, sizeof(struct tipb_softc),
     tipb_match, tipb_attach, NULL, NULL);
 
 static int tipb_attached;