From 2d12d35cf879bb7524efac79dfd121aa4d39266d Mon Sep 17 00:00:00 2001
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 5 Aug 2014 16:31:03 +0000
Subject: [PATCH] Set ofwbus and simplebus to attach during BUS_PASS_BUS.

---
 sys/dev/fdt/simplebus.c | 6 ++++--
 sys/dev/ofw/ofwbus.c    | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c
index 1de4223bd79..602ac737d90 100644
--- a/sys/dev/fdt/simplebus.c
+++ b/sys/dev/fdt/simplebus.c
@@ -121,8 +121,10 @@ static driver_t simplebus_driver = {
 	sizeof(struct simplebus_softc)
 };
 static devclass_t simplebus_devclass;
-DRIVER_MODULE(simplebus, ofwbus, simplebus_driver, simplebus_devclass, 0, 0);
-DRIVER_MODULE(simplebus, simplebus, simplebus_driver, simplebus_devclass, 0, 0);
+EARLY_DRIVER_MODULE(simplebus, ofwbus, simplebus_driver, simplebus_devclass,
+    0, 0, BUS_PASS_BUS);
+EARLY_DRIVER_MODULE(simplebus, simplebus, simplebus_driver, simplebus_devclass,
+    0, 0, BUS_PASS_BUS);
 
 static int
 simplebus_probe(device_t dev)
diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c
index aa7566b5297..cd89e28a6a3 100644
--- a/sys/dev/ofw/ofwbus.c
+++ b/sys/dev/ofw/ofwbus.c
@@ -136,7 +136,8 @@ static driver_t ofwbus_driver = {
 	sizeof(struct ofwbus_softc)
 };
 static devclass_t ofwbus_devclass;
-DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, ofwbus_devclass, 0, 0);
+EARLY_DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, ofwbus_devclass, 0, 0,
+    BUS_PASS_BUS);
 MODULE_VERSION(ofwbus, 1);
 
 static const char *const ofwbus_excl_name[] = {