summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-09-17 05:11:48 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-09-17 05:11:48 +0000
commitd6f2ddb00507d9a7eff12c683b66d41448b8aee5 (patch)
treeceda9a5d3a7ac25ce9bbb37f4e844d7f685470f1 /sys/arch
parent740e01cf6d5c399b22f5ade1b37faf52b422c3e4 (diff)
fxp cardbus attachment
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/conf/GENERIC7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 2860f8055ca..4b44fed78b0 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.207 2000/09/15 17:27:35 mickey Exp $
+# $OpenBSD: GENERIC,v 1.208 2000/09/17 05:11:47 aaron Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -274,6 +274,7 @@ le* at pci? dev ? function ? # PCnet-PCI based ethernet
le* at isapnp?
de* at pci? dev ? function ? # DC21X4X-based ethernet
fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet
+fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet
ne* at pci? dev ? function ? # NE2000-compat ethernet
ep0 at pci? dev ? function ? # 3C59x ethernet
ep* at pci? dev ? function ? # 3C59x ethernet
@@ -282,8 +283,8 @@ ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet
sm* at pcmcia? function ? # PCMCIA based sm ethernet
xe* at pcmcia? function ? # Xircom ethernet
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
-xl* at pci? dev ? function ? # 3c9xx ethernet
-xl* at cardbus? dev ? function ? # 3c575 ethernet
+xl* at pci? dev ? function ? # 3C9xx ethernet
+xl* at cardbus? dev ? function ? # 3C575/3C656 ethernet
rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet
tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet
tl* at pci? dev ? function ? # Compaq Thunderlan ethernet