Hang acpi(4) below bios(4) instead of mainbus(4). This lets us move acpi(4)

before pcibios(4), and then.... if acpi(4) attaches, skip pcibios(4) since
it messes the machines up.  Fixes claudio's HP dl320 G5, and almost assuredly
others.
ok kettenis

1 files changed, 13 insertions, 14 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index fcf872d6569..ac05736d1f1 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.594 2007/12/04 23:39:51 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.595 2007/12/05 19:17:13 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -41,23 +41,12 @@ mainbus0 at root
 cpu0	at mainbus?
 bios0	at mainbus0
 apm0	at bios0 flags 0x0000	# flags 0x0101 to force protocol version 1.1
+acpi0	at bios?
+#option	ACPIVERBOSE
 pcibios0 at bios0 flags 0x0000	# use 0x30 for a total verbose
 ipmi0	at mainbus? disable	# IPMI
 esm0	at mainbus? 		# Dell Embedded Server Management
 
-isa0	at mainbus0
-isa0	at pcib?
-isa0	at amdpcib?
-isa0	at ichpcib?
-isa0	at piixpcib?
-isa0	at gscpcib?
-isa0	at glxpcib?
-eisa0	at mainbus0
-pci*	at mainbus0
-
-#option		ACPIVERBOSE
-
-acpi0		at mainbus?
 acpitimer*	at acpi?
 acpihpet*	at acpi?
 acpiac*		at acpi?
@@ -73,6 +62,16 @@ option		PCIVERBOSE
 option		EISAVERBOSE
 option		USBVERBOSE
 
+isa0	at mainbus0
+isa0	at pcib?
+isa0	at amdpcib?
+isa0	at ichpcib?
+isa0	at piixpcib?
+isa0	at gscpcib?
+isa0	at glxpcib?
+eisa0	at mainbus0
+pci*	at mainbus0
+
 pchb*	at pci?			# PCI-Host bridges
 ppb*	at pci?			# PCI-PCI bridges
 pci*	at ppb?