summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2000-05-03 00:49:57 +0000
committerimp <imp@FreeBSD.org>2000-05-03 00:49:57 +0000
commita4be5117572ccf21bb92a536f18b1f7f36d16836 (patch)
treec4e8c1d1d40202a97532f58cdf2fa383ab0dab7a /sys/i386
parent5182ed8f6de1e4cd3b88c6074f69007d6e042242 (diff)
downloadFreeBSD-src-a4be5117572ccf21bb92a536f18b1f7f36d16836.zip
FreeBSD-src-a4be5117572ccf21bb92a536f18b1f7f36d16836.tar.gz
Move sn and cs drivers from the compat section to the real section.
Enable xe driver now that I've had reports that it works. PR: 18323 Submitted by: MIHIRA Yoshiro-san
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/conf/GENERIC8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 56b9607..72b66fd 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -180,6 +180,8 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
device ed0 at isa? port 0x280 irq 10 iomem 0xd8000
device ex
device ep
+device cs0 at isa? port 0x300
+device sn0 at isa? port 0x300 irq 10
# WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
# exists only as a PCMCIA device, so there is no ISA attatement needed
# and resources will always be dynamically assigned by the pccard code.
@@ -192,15 +194,13 @@ device wi
device an
# BayStack 660 and others
device awi
+# Xircom pccard ethernet
+device xe
# The probe order of these is presently determined by i386/isa/isa_compat.c.
device ie0 at isa? port 0x300 irq 10 iomem 0xd0000
device fe0 at isa? port 0x300
device le0 at isa? port 0x300 irq 5 iomem 0xd0000
device lnc0 at isa? port 0x280 irq 10 drq 0
-device cs0 at isa? port 0x300
-device sn0 at isa? port 0x300 irq 10
-# Disabled because it is currently broken.
-#device xe
# Pseudo devices - the number indicates how many units to allocated.
pseudo-device loop # Network loopback
OpenPOWER on IntegriCloud