diff options
| author | mux <mux@FreeBSD.org> | 2005-07-29 15:40:58 +0000 |
|---|---|---|
| committer | mux <mux@FreeBSD.org> | 2005-07-29 15:40:58 +0000 |
| commit | 2b12b67f247957b7ef721777b73d09bc04f6f5e4 (patch) | |
| tree | 2d240d6d7d7a3da2789608056610b9fbeb135185 /sys/amd64/conf | |
| parent | 76233f99bb7be8cb374e99a40c98313e02bba971 (diff) | |
| download | FreeBSD-src-2b12b67f247957b7ef721777b73d09bc04f6f5e4.zip FreeBSD-src-2b12b67f247957b7ef721777b73d09bc04f6f5e4.tar.gz | |
MFC r1.441:
date: 2005/07/24 17:55:57; author: mux; state: Exp; lines: +1 -2
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
Approved by: re@ (kensmith)
Diffstat (limited to 'sys/amd64/conf')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 18930bc..3a916b7 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 |
