pcic* at pci

5 files changed, 20 insertions, 6 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index d9496aa63d8..b0484846add 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.199 2000/08/02 13:55:51 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.200 2000/08/02 14:08:38 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -64,7 +64,7 @@ pcic2	at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
 #tcic0	at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
 
 # PCI PCMCIA controllers
-pcic0   at pci? dev? function ?
+pcic*	at pci? dev? function ?
 
 # PCMCIA bus support
 pcmcia*	at pcic? controller ? socket ?
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 0bad7b1aa48..e57de3f198f 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.89 2000/08/02 13:55:51 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.90 2000/08/02 14:08:38 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -70,6 +70,9 @@ pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
 pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
 pcic2	at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000
 
+# PCI PCMCIA controllers
+pcic*	at pci? dev? function ?
+
 # PCMCIA bus support
 pcmcia*	at pcic? controller ? socket ?
 
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 8fe4ced4ad0..5d290842f97 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.17 2000/08/02 13:55:51 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.18 2000/08/02 14:08:38 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -68,6 +68,10 @@ pci*	at pchb? bus ?
 # ISA PCMCIA controllers
 pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
 pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
+pcic2	at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000
+
+# PCI PCMCIA controllers
+pcic*	at pci? dev? function ?
 
 # PCMCIA bus support
 pcmcia*	at pcic? controller ? socket ?
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index a8c1a1ec3bc..f6d6d8564bb 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKC,v 1.2 2000/08/02 13:55:51 deraadt Exp $
+#	$OpenBSD: RAMDISKC,v 1.3 2000/08/02 14:08:38 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -70,6 +70,9 @@ pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
 pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
 pcic2	at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000
 
+# PCI PCMCIA controllers
+pcic*	at pci? dev? function ?
+
 # PCMCIA bus support
 pcmcia*	at pcic? controller ? socket ?
 
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index aab7e0240ff..a34dad44374 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.16 2000/07/02 18:18:59 millert Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.17 2000/08/02 14:08:38 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -68,6 +68,10 @@ pci*	at pchb? bus ?
 # ISA PCMCIA controllers
 pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
 pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
+pcic2	at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000
+
+# PCI PCMCIA controllers
+pcic*	at pci? dev? function ?
 
 # PCMCIA bus support
 pcmcia*	at pcic? controller ? socket ?