diff options
| author | marius <marius@FreeBSD.org> | 2006-05-17 20:44:01 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2006-05-17 20:44:01 +0000 |
| commit | 0d3e65af241ebaba4c919483825a21c4e6e36134 (patch) | |
| tree | 43d87f0f4815cfdc5b73d79e85dbcce4996dd72c /sys/i386 | |
| parent | fbc4e2cc405809bd07100b908a28772240981fe2 (diff) | |
| download | FreeBSD-src-0d3e65af241ebaba4c919483825a21c4e6e36134.zip FreeBSD-src-0d3e65af241ebaba4c919483825a21c4e6e36134.tar.gz | |
- As only the PCI front-end of le(4) is common to all platforms move its
entry to the PCI NICs section so it's in the same spot in all GENERIC
config files.
- Add a note to the description of pcn(4) informing that is has precedence
over le(4).
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/GENERIC | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 66f8458..9300993 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -194,6 +194,7 @@ device ppi # Parallel port interface device device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card device ixgb # Intel PRO/10GbE Ethernet Card +device le # AMD Am7900 LANCE and Am79C9xx PCnet device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') @@ -208,7 +209,7 @@ device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet device nge # NatSemi DP83820 gigabit Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking -device pcn # AMD Am79C97x PCI 10/100 +device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') @@ -231,7 +232,6 @@ device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device le # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet |
