From 61a95b9f21a862d7ea5e5066fa900ee8a32eb210 Mon Sep 17 00:00:00 2001
From: Marco Peereboom <marco@cvs.openbsd.org>
Date: Mon, 13 Mar 2006 15:57:19 +0000
Subject: Fix machines that need PCI access during ACPI bringup.

Help and ok kettenis.
---
 sys/arch/amd64/amd64/mainbus.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sys/arch/amd64/amd64/mainbus.c b/sys/arch/amd64/amd64/mainbus.c
index 338f932eb6f..d8ddd224ec2 100644
--- a/sys/arch/amd64/amd64/mainbus.c
+++ b/sys/arch/amd64/amd64/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.4 2005/12/29 00:50:43 kettenis Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.5 2006/03/13 15:57:18 marco Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.1 2003/04/26 18:39:29 fvdl Exp $	*/
 
 /*
@@ -148,7 +148,14 @@ mainbus_attach(parent, self, aux)
 
 	printf("\n");
 
+#if NPCI > 0
+	pci_mode = pci_mode_detect();
+#endif
+
 #if NACPI > 0
+#if NPCI > 0
+	if (pci_mode != 0)
+#endif
 	{
 		memset(&mba.mba_aaa, 0, sizeof(mba.mba_aaa));
 		mba.mba_aaa.aaa_name = "acpi";
@@ -174,10 +181,6 @@ mainbus_attach(parent, self, aux)
 	mpbios_present = mpbios_probe(self);
 #endif
 
-#if NPCI > 0
-	pci_mode = pci_mode_detect();
-#endif
-
 #ifdef MPBIOS
 	if (mpbios_present)
 		mpbios_scan(self);
-- 
cgit v1.2.3