summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2006-03-13 15:40:38 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2006-03-13 15:40:38 +0000
commitdf508cb48e320a45b38f5c2b7491c180c5993660 (patch)
tree956261b08a5aa9dc8c7a5a00b4060f656f91efff /sys
parent80d800fbfd885e4b3e5688f93f3926101161ab6a (diff)
Fix machines that need PCI access during ACPI bringup.
Inspired by gklok@cogeco.ca. ok kettenis
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/i386/mainbus.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index fe0cf10b75b..6397fb6d2f9 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.23 2006/01/19 03:50:44 marco Exp $ */
+/* $OpenBSD: mainbus.c,v 1.24 2006/03/13 15:40:37 marco Exp $ */
/* $NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $ */
/*
@@ -155,6 +155,9 @@ mainbus_attach(parent, self, aux)
}
#endif
#if NACPI > 0
+#if NPCI > 0
+ if (pci_mode_detect() != 0)
+#endif
{
memset(&mba.mba_aaa, 0, sizeof(mba.mba_aaa));
mba.mba_aaa.aaa_name = "acpi";