# HG changeset patch
# Parent 3a806ca4387cc6649eda523f159fe4e826e30f25
Kludges and such for newbus... some good some bad.

diff -r 3a806ca4387c sys/kern/subr_bus.c
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -923,6 +923,7 @@ bus_set_pass(int pass)
 		 * the tree.
 		 */
 		bus_current_pass = dl->pass;
+		printf("#*#*#*#*#*##*#*# New PASS: %d\n", bus_current_pass);
 		BUS_NEW_PASS(root_bus);
 	}
 
@@ -2826,6 +2827,12 @@ device_attach(device_t dev)
 		return (ENXIO);
 	}
 
+	if (!(dev->flags & DF_ENABLED)) {
+		if (bootverbose)
+			 device_printf(dev, "disabled by bus.\n");
+		return (ENXIO);
+	}
+
 	device_sysctl_init(dev);
 	if (!device_is_quiet(dev))
 		device_print_child(dev->parent, dev);