summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK4
-rw-r--r--sys/arch/i386/conf/RAMDISKB4
-rw-r--r--sys/arch/i386/conf/RAMDISKC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD4
5 files changed, 14 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 6e8239c2994..1b5d553f15d 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.283 2001/11/30 00:17:02 nate Exp $
+# $OpenBSD: GENERIC,v 1.284 2001/12/24 20:11:11 mickey Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -55,7 +55,7 @@ pchb* at pci? dev ? function ? # PCI-Host bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
pci* at ppb? bus ?
pci* at pchb? bus ?
-pcib* at pci? dev ? function ? # PCI-ISA bridges (do nothing)
+pcib* at pci? dev ? function ? # PCI-ISA bridge
# ISA PCMCIA controllers
#option PCMCIAVERBOSE
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index c937253c342..ca48032d73a 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.110 2001/10/10 23:43:43 millert Exp $
+# $OpenBSD: RAMDISK,v 1.111 2001/12/24 20:11:11 mickey Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -47,6 +47,7 @@ apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1
pcibios0 at bios0 flags 0x0000
isa0 at mainbus0
+isa0 at pcib?
eisa0 at mainbus0
pci* at mainbus0
@@ -57,6 +58,7 @@ pchb* at pci? dev ? function ? # PCI-Host bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
pci* at ppb? bus ?
pci* at pchb? bus ?
+pcib* at pci? dev ? function ? # PCI-ISA bridge
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 4d18ce68ad9..4c5755e1665 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.46 2001/12/05 23:46:20 deraadt Exp $
+# $OpenBSD: RAMDISKB,v 1.47 2001/12/24 20:11:11 mickey Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -47,6 +47,7 @@ apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1
pcibios0 at bios0 flags 0x0000
isa0 at mainbus0
+isa0 at pcib?
eisa0 at mainbus0
pci* at mainbus0
@@ -57,6 +58,7 @@ pchb* at pci? dev ? function ? # PCI-Host bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
pci* at ppb? bus ?
pci* at pchb? bus ?
+pcib* at pci? dev ? function ? # PCI-ISA bridge
# ISA PCMCIA controllers
#pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 9c2e2ebbb8d..d1c2e4d04bc 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.25 2001/10/10 23:43:43 millert Exp $
+# $OpenBSD: RAMDISKC,v 1.26 2001/12/24 20:11:11 mickey Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -47,6 +47,7 @@ apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1
pcibios0 at bios0 flags 0x0000
isa0 at mainbus0
+isa0 at pcib?
eisa0 at mainbus0
pci* at mainbus0
@@ -57,6 +58,7 @@ pchb* at pci? dev ? function ? # PCI-Host bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
pci* at ppb? bus ?
pci* at pchb? bus ?
+pcib* at pci? dev ? function ? # PCI-ISA bridge
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 3f75ce3eac0..dfbd751569d 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.51 2001/10/10 23:43:43 millert Exp $
+# $OpenBSD: RAMDISK_CD,v 1.52 2001/12/24 20:11:11 mickey Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -45,6 +45,7 @@ apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1
pcibios0 at bios0 flags 0x0000
isa0 at mainbus0
+isa0 at pcib?
eisa0 at mainbus0
pci* at mainbus0
@@ -55,6 +56,7 @@ pchb* at pci? dev ? function ? # PCI-Host bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
pci* at ppb? bus ?
pci* at pchb? bus ?
+pcib* at pci? dev ? function ? # PCI-ISA bridge
# CardBus bus support
cardbus* at cardslot?