summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 8e2b6c63234..d1d635cbfa4 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.174 2000/04/07 22:25:43 aaron Exp $
+# $OpenBSD: GENERIC,v 1.175 2000/04/08 05:50:49 aaron Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -64,6 +64,12 @@ pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
+# CardBus bus support
+#cardbus* at cardslot?
+#pcmcia* at cardslot?
+#cbb* at pci? dev ? function ?
+#cardslot* at cbb?
+
# PCI USB Controllers
#uhci* at pci? # Universal Host Controller (Intel)
#ohci* at pci? # Open Host Controller
@@ -260,6 +266,7 @@ 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
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