4 files changed, 12 insertions, 28 deletions

diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c
index 32d606284614..5271cbc27f65 100644
--- a/sys/amd64/amd64/legacy.c
+++ b/sys/amd64/amd64/legacy.c
@@ -40,8 +40,6 @@
  * and I/O memory address space.
  */
 
-#include "mca.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -245,21 +243,19 @@ nexus_attach(device_t dev)
 	 * connection points now so they show up "on motherboard".
 	 */
 	if (!devclass_get_device(devclass_find("eisa"), 0)) {
-		child = device_add_child(dev, "eisa", 0);
+		child = BUS_ADD_CHILD(dev, 0, "eisa", 0);
 		if (child == NULL)
 			panic("nexus_attach eisa");
 		device_probe_and_attach(child);
 	}
-#if NMCA > 0
 	if (!devclass_get_device(devclass_find("mca"), 0)) {
-        	child = device_add_child(dev, "mca", 0);
+        	child = BUS_ADD_CHILD(dev, 0, "mca", 0);
         	if (child == 0)
                 	panic("nexus_probe mca");
 		device_probe_and_attach(child);
 	}
-#endif
 	if (!devclass_get_device(devclass_find("isa"), 0)) {
-		child = device_add_child(dev, "isa", 0);
+		child = BUS_ADD_CHILD(dev, 0, "isa", 0);
 		if (child == NULL)
 			panic("nexus_attach isa");
 		device_probe_and_attach(child);
diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c
index 32d606284614..5271cbc27f65 100644
--- a/sys/amd64/amd64/nexus.c
+++ b/sys/amd64/amd64/nexus.c
@@ -40,8 +40,6 @@
  * and I/O memory address space.
  */
 
-#include "mca.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -245,21 +243,19 @@ nexus_attach(device_t dev)
 	 * connection points now so they show up "on motherboard".
 	 */
 	if (!devclass_get_device(devclass_find("eisa"), 0)) {
-		child = device_add_child(dev, "eisa", 0);
+		child = BUS_ADD_CHILD(dev, 0, "eisa", 0);
 		if (child == NULL)
 			panic("nexus_attach eisa");
 		device_probe_and_attach(child);
 	}
-#if NMCA > 0
 	if (!devclass_get_device(devclass_find("mca"), 0)) {
-        	child = device_add_child(dev, "mca", 0);
+        	child = BUS_ADD_CHILD(dev, 0, "mca", 0);
         	if (child == 0)
                 	panic("nexus_probe mca");
 		device_probe_and_attach(child);
 	}
-#endif
 	if (!devclass_get_device(devclass_find("isa"), 0)) {
-		child = device_add_child(dev, "isa", 0);
+		child = BUS_ADD_CHILD(dev, 0, "isa", 0);
 		if (child == NULL)
 			panic("nexus_attach isa");
 		device_probe_and_attach(child);
diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c
index 32d606284614..5271cbc27f65 100644
--- a/sys/i386/i386/legacy.c
+++ b/sys/i386/i386/legacy.c
@@ -40,8 +40,6 @@
  * and I/O memory address space.
  */
 
-#include "mca.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -245,21 +243,19 @@ nexus_attach(device_t dev)
 	 * connection points now so they show up "on motherboard".
 	 */
 	if (!devclass_get_device(devclass_find("eisa"), 0)) {
-		child = device_add_child(dev, "eisa", 0);
+		child = BUS_ADD_CHILD(dev, 0, "eisa", 0);
 		if (child == NULL)
 			panic("nexus_attach eisa");
 		device_probe_and_attach(child);
 	}
-#if NMCA > 0
 	if (!devclass_get_device(devclass_find("mca"), 0)) {
-        	child = device_add_child(dev, "mca", 0);
+        	child = BUS_ADD_CHILD(dev, 0, "mca", 0);
         	if (child == 0)
                 	panic("nexus_probe mca");
 		device_probe_and_attach(child);
 	}
-#endif
 	if (!devclass_get_device(devclass_find("isa"), 0)) {
-		child = device_add_child(dev, "isa", 0);
+		child = BUS_ADD_CHILD(dev, 0, "isa", 0);
 		if (child == NULL)
 			panic("nexus_attach isa");
 		device_probe_and_attach(child);
diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c
index 32d606284614..5271cbc27f65 100644
--- a/sys/i386/i386/nexus.c
+++ b/sys/i386/i386/nexus.c
@@ -40,8 +40,6 @@
  * and I/O memory address space.
  */
 
-#include "mca.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -245,21 +243,19 @@ nexus_attach(device_t dev)
 	 * connection points now so they show up "on motherboard".
 	 */
 	if (!devclass_get_device(devclass_find("eisa"), 0)) {
-		child = device_add_child(dev, "eisa", 0);
+		child = BUS_ADD_CHILD(dev, 0, "eisa", 0);
 		if (child == NULL)
 			panic("nexus_attach eisa");
 		device_probe_and_attach(child);
 	}
-#if NMCA > 0
 	if (!devclass_get_device(devclass_find("mca"), 0)) {
-        	child = device_add_child(dev, "mca", 0);
+        	child = BUS_ADD_CHILD(dev, 0, "mca", 0);
         	if (child == 0)
                 	panic("nexus_probe mca");
 		device_probe_and_attach(child);
 	}
-#endif
 	if (!devclass_get_device(devclass_find("isa"), 0)) {
-		child = device_add_child(dev, "isa", 0);
+		child = BUS_ADD_CHILD(dev, 0, "isa", 0);
 		if (child == NULL)
 			panic("nexus_attach isa");
 		device_probe_and_attach(child);