summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2005-03-16 20:23:31 +0000
committerobrien <obrien@FreeBSD.org>2005-03-16 20:23:31 +0000
commit1a521474bdd49fa02ebac0d51455b6e41430b7fd (patch)
tree749944b45da0390c1d2b6c6a55035204a899a63e /sys
parentb424be5faf903765c0bce696526fc069a45cd833 (diff)
downloadFreeBSD-src-1a521474bdd49fa02ebac0d51455b6e41430b7fd.zip
FreeBSD-src-1a521474bdd49fa02ebac0d51455b6e41430b7fd.tar.gz
Make it clear nve needs mii, and shorten long comment line.
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/conf/GENERIC4
-rw-r--r--sys/i386/conf/GENERIC4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index d5747dd..3602353 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -176,7 +176,6 @@ 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 nve # nVidia nForce MCP on-board Ethernet Networking
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')
@@ -189,7 +188,8 @@ device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device lge # Level 1 LXT1001 gigabit Ethernet
device nge # NatSemi DP83820 gigabit Ethernet
-device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc')
+device nve # nVidia nForce MCP on-board Ethernet Networking
+device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (``Starfire'')
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index af11d81..8adf9f5 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -195,7 +195,6 @@ 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 nve # nVidia nForce MCP on-board Ethernet Networking
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')
@@ -208,7 +207,8 @@ device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device lge # Level 1 LXT1001 gigabit Ethernet
device nge # NatSemi DP83820 gigabit Ethernet
-device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc')
+device nve # nVidia nForce MCP on-board Ethernet Networking
+device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (``Starfire'')
OpenPOWER on IntegriCloud