summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormux <mux@FreeBSD.org>2005-07-24 17:55:57 +0000
committermux <mux@FreeBSD.org>2005-07-24 17:55:57 +0000
commit570ffe8009f1ffd621a89fd406cd07ff51a6f5ab (patch)
treeac4689c29e0f52ea862c1e09d23b02097eff818e
parentb29c8f5d6430823b9692023da05b35945fbccb4e (diff)
downloadFreeBSD-src-570ffe8009f1ffd621a89fd406cd07ff51a6f5ab.zip
FreeBSD-src-570ffe8009f1ffd621a89fd406cd07ff51a6f5ab.tar.gz
Add back ed(4) in amd64 GENERIC. It now works nicely and since those
chips are commonly found, it makes sense to have it in GENERIC. This is a candidate for a RELENG_6 MFC. Approved by; peter Requested by: pav Tested by: pav
-rw-r--r--sys/amd64/conf/GENERIC3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 7137d32..450b6a8 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -215,8 +215,7 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
# ISA Ethernet NICs. pccard NICs included.
device cs # Crystal Semiconductor CS89x0 NIC
# 'device ed' requires 'device miibus'
-# XXX kvtop brokenness, pointer/int warnings
-#device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
+device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
OpenPOWER on IntegriCloud