summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-10-26 20:50:45 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-10-26 20:50:45 +0000
commit948f076ca0946c27e2283d0d442c7b55a84f2bc2 (patch)
treec7d79cb835b3a02061b754deae11d45e82599626 /sys/arch/i386/conf
parentc8b93224246edba27e693e5e51e5368c654387f1 (diff)
Add support for Xircom X3201-based CardBus Ethernet cards. Tested successfully
on four different models, including the CBEM56G-100, RBE-100 RealPort, and the RBEM56G-100 RealPort. This commit adds support only for the LAN components; the modem is not configured yet. Detach support to come. Based on work from FreeBSD, mickey@, nate@, and myself.
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a1ab9467037..fbc126ce726 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.211 2000/10/17 15:59:05 jason Exp $
+# $OpenBSD: GENERIC,v 1.212 2000/10/26 20:50:44 aaron Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -294,6 +294,7 @@ sf* at pci? dev ? function ? # Adaptec AIC-6915 ethernet
sis* at pci? dev ? function ? # SiS 900/7016 ethernet
ste* at pci? dev ? function ? # Sundance ST201 ethernet
dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet
+dc* at cardbus? dev ? function ? # 21143, "tulip" clone ethernet
ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet
skc* at pci? dev ? function ? # SysKonnect GEnesis 984x
sk* at skc? # each port of above