summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdodd <mdodd@FreeBSD.org>2003-06-13 00:43:57 +0000
committermdodd <mdodd@FreeBSD.org>2003-06-13 00:43:57 +0000
commitf7366986b75e25cef2a0167fe951b8ee613d671a (patch)
treee1f7438755d1f2239758b0122f09432d0f3c24a7
parentbdd65ff5ef4b9900caab4d1e6bc78cd999920c7a (diff)
downloadFreeBSD-src-f7366986b75e25cef2a0167fe951b8ee613d671a.zip
FreeBSD-src-f7366986b75e25cef2a0167fe951b8ee613d671a.tar.gz
Conditionally attach the MCA bus device.
-rw-r--r--sys/i386/i386/legacy.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c
index d4b9dda1..7d72f4f 100644
--- a/sys/i386/i386/legacy.c
+++ b/sys/i386/i386/legacy.c
@@ -44,6 +44,11 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <sys/rman.h>
+#include "opt_mca.h"
+#ifdef DEV_MCA
+#include <i386/bios/mca_machdep.h>
+#endif
+
#include <machine/legacyvar.h>
#include <machine/resource.h>
@@ -159,12 +164,14 @@ legacy_attach(device_t dev)
panic("legacy_attach eisa");
device_probe_and_attach(child);
}
- if (!devclass_get_device(devclass_find("mca"), 0)) {
+#ifdef DEV_MCA
+ if (MCA_system && !devclass_get_device(devclass_find("mca"), 0)) {
child = BUS_ADD_CHILD(dev, 0, "mca", 0);
if (child == 0)
panic("legacy_probe mca");
device_probe_and_attach(child);
}
+#endif
if (!devclass_get_device(devclass_find("isa"), 0)) {
child = BUS_ADD_CHILD(dev, 0, "isa", 0);
if (child == NULL)
OpenPOWER on IntegriCloud