summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2000-01-13 16:33:43 +0000
committerderaadt <deraadt@openbsd.org>2000-01-13 16:33:43 +0000
commit3e924a64b39871b2689060de9235892eb7a78c28 (patch)
tree0865b01662c9e4d19d16683d9b99648b9485aa5a
parentRearrange IPXPROTO and IPXPORT names; add socket option for checksum; use (diff)
downloadwireguard-openbsd-3e924a64b39871b2689060de9235892eb7a78c28.tar.xz
wireguard-openbsd-3e924a64b39871b2689060de9235892eb7a78c28.zip
add pcic2; matt@zigg.com
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/RAMDISK3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 33a44783441..87abf6ab6b1 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.154 2000/01/09 22:00:20 itojun Exp $
+# $OpenBSD: GENERIC,v 1.155 2000/01/13 16:33:43 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -61,6 +61,7 @@ pcib* at pci? dev ? function ? # PCI-ISA bridges (do nothing)
# 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
# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index dd667fc8ac1..e9d145402de 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.76 2000/01/09 01:42:26 jason Exp $
+# $OpenBSD: RAMDISK,v 1.77 2000/01/13 16:33:43 deraadt Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -73,6 +73,7 @@ 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
# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?