diff --git a/sys/arch/arm32/footbridge/footbridge_clock.c b/sys/arch/arm32/footbridge/footbridge_clock.c
index cdd69da5b8b9..099246175734 100644
--- a/sys/arch/arm32/footbridge/footbridge_clock.c
+++ b/sys/arch/arm32/footbridge/footbridge_clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: footbridge_clock.c,v 1.3 2000/01/22 05:21:24 tsutsui Exp $	*/
+/*	$NetBSD: footbridge_clock.c,v 1.4 2000/02/13 04:59:57 mark Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -73,7 +73,7 @@ clockmatch(parent, cf, aux)
 {
 	union footbridge_attach_args *fba = aux;
 
-	if (strcmp(fba->fba_ca.ca_name, "clk") == 0 && cf->cf_unit == 0)
+	if (strcmp(fba->fba_ca.ca_name, "clk") == 0)
 		return(1);
 	return(0);
 }
diff --git a/sys/arch/arm32/footbridge/footbridge_com.c b/sys/arch/arm32/footbridge/footbridge_com.c
index dd26f3f29ba6..21db790980d9 100644
--- a/sys/arch/arm32/footbridge/footbridge_com.c
+++ b/sys/arch/arm32/footbridge/footbridge_com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: footbridge_com.c,v 1.2 1998/10/05 02:36:02 mark Exp $	*/
+/*	$NetBSD: footbridge_com.c,v 1.3 2000/02/13 04:59:57 mark Exp $	*/
 
 /*-
  * Copyright (c) 1997 Mark Brinicombe
@@ -153,7 +153,7 @@ fcom_probe(parent, cf, aux)
 {
 	union footbridge_attach_args *fba = aux;
 
-	if (strcmp(fba->fba_name, "fcom") == 0 && cf->cf_unit == 0)
+	if (strcmp(fba->fba_name, "fcom") == 0)
 		return(1);
 	return(0);
 }
diff --git a/sys/arch/arm32/iomd/iomd_clock.c b/sys/arch/arm32/iomd/iomd_clock.c
index f7c93ab559d3..e5b67bf60864 100644
--- a/sys/arch/arm32/iomd/iomd_clock.c
+++ b/sys/arch/arm32/iomd/iomd_clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iomd_clock.c,v 1.20 2000/01/22 05:21:25 tsutsui Exp $	*/
+/*	$NetBSD: iomd_clock.c,v 1.21 2000/02/13 04:59:58 mark Exp $	*/
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -92,7 +92,7 @@ clockmatch(parent, cf, aux)
 {
 	struct clk_attach_args *ca = aux;
 
-	if (strcmp(ca->ca_name, "clk") == 0 && cf->cf_unit == 0)
+	if (strcmp(ca->ca_name, "clk") == 0)
 		return(1);
 	return(0);
 }
diff --git a/sys/arch/arm32/mainbus/cpu.c b/sys/arch/arm32/mainbus/cpu.c
index 5d94b51b77b0..cc347fbf4ab0 100644
--- a/sys/arch/arm32/mainbus/cpu.c
+++ b/sys/arch/arm32/mainbus/cpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.21 1999/02/26 12:05:49 is Exp $	*/
+/*	$NetBSD: cpu.c,v 1.22 2000/02/13 04:59:58 mark Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -99,10 +99,7 @@ cpumatch(parent, cf, aux)
 	struct cfdata *cf;
 	void *aux;
 {
-
-	if (cf->cf_unit == 0)
-		return(1);
-	return(0);
+	return(1);
 }
 
 
diff --git a/sys/arch/arm32/mainbus/mainbus.c b/sys/arch/arm32/mainbus/mainbus.c
index ffb7241bab54..c90402bbcd74 100644
--- a/sys/arch/arm32/mainbus/mainbus.c
+++ b/sys/arch/arm32/mainbus/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.13 1998/01/18 03:42:58 mark Exp $ */
+/* $NetBSD: mainbus.c,v 1.14 2000/02/13 04:59:58 mark Exp $ */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -86,9 +86,7 @@ mainbusmatch(parent, cf, aux)
 	struct cfdata *cf;
 	void *aux;
 {
-	if (cf->cf_unit == 0)
-		return(1);
-	return (0);
+	return (1);
 }
 
 /*