make them all use new PCIBIOS stuff

5 files changed, 21 insertions, 7 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index b0484846add..40cf2e8e9bf 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.200 2000/08/02 14:08:38 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.201 2000/08/08 19:23:43 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -77,7 +77,8 @@ cbb*		at pci? dev ? function ?
 cardslot*	at cbb?
 
 # NOTE: You may need to uncomment the following line for CardBus to work
-option	BIOS32,PCIBIOS,PCIBIOS_INTR_FIXUP,PCIBIOS_BUS_FIXUP
+option	BIOS32,PCIBIOS
+option	PCIBIOS_INTR_FIXUP,PCIBIOS_BUS_FIXUP,PCIBIOS_ADDR_FIXUP
 
 # PCI USB Controllers
 #uhci*	at pci?				# Universal Host Controller (Intel)
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index e57de3f198f..a3988bb049a 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.90 2000/08/02 14:08:38 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.91 2000/08/08 19:23:44 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -76,6 +76,10 @@ pcic*	at pci? dev? function ?
 # PCMCIA bus support
 pcmcia*	at pcic? controller ? socket ?
 
+# NOTE: You may need to uncomment the following line for CardBus to work
+option	BIOS32,PCIBIOS
+option	PCIBIOS_INTR_FIXUP,PCIBIOS_BUS_FIXUP,PCIBIOS_ADDR_FIXUP
+
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 5d290842f97..17becaf8c7c 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.18 2000/08/02 14:08:38 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.19 2000/08/08 19:23:44 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -76,6 +76,10 @@ pcic*	at pci? dev? function ?
 # PCMCIA bus support
 pcmcia*	at pcic? controller ? socket ?
 
+# NOTE: You may need to uncomment the following line for CardBus to work
+option	BIOS32,PCIBIOS
+option	PCIBIOS_INTR_FIXUP,PCIBIOS_BUS_FIXUP,PCIBIOS_ADDR_FIXUP
+
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index f6d6d8564bb..0a668a45797 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKC,v 1.3 2000/08/02 14:08:38 deraadt Exp $
+#	$OpenBSD: RAMDISKC,v 1.4 2000/08/08 19:23:44 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -83,7 +83,8 @@ cbb*		at pci? dev ? function ?
 cardslot*	at cbb?
 
 # NOTE: You may need to uncomment the following line for CardBus to work
-option	BIOS32,PCIBIOS,PCIBIOS_INTR_FIXUP,PCIBIOS_BUS_FIXUP
+option	BIOS32,PCIBIOS
+option	PCIBIOS_INTR_FIXUP,PCIBIOS_BUS_FIXUP,PCIBIOS_ADDR_FIXUP
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index a34dad44374..5ff30c42a7c 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.17 2000/08/02 14:08:38 deraadt Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.18 2000/08/08 19:23:44 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -76,6 +76,10 @@ pcic*	at pci? dev? function ?
 # PCMCIA bus support
 pcmcia*	at pcic? controller ? socket ?
 
+# NOTE: You may need to uncomment the following line for CardBus to work
+option	BIOS32,PCIBIOS
+option	PCIBIOS_INTR_FIXUP,PCIBIOS_BUS_FIXUP,PCIBIOS_ADDR_FIXUP
+
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?