summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/conf/GENERIC2
-rw-r--r--sys/conf/NOTES4
-rw-r--r--sys/i386/conf/GENERIC2
-rw-r--r--sys/i386/conf/NOTES4
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 4d73aa7..c660ea3 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -161,7 +161,6 @@ device ppi # Parallel port interface device
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
-device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device vx # 3Com 3c590, 3c595 (``Vortex'')
device wx # Intel Gigabit Ethernet Card (``Wiseman'')
@@ -169,6 +168,7 @@ device wx # Intel Gigabit Ethernet Card (``Wiseman'')
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
device dc # DEC/Intel 21143 and various workalikes
+device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device pcn # AMD Am79C79x PCI 10/100 NICs
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (``Starfire'')
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 0add3b5..1175d4b 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1787,6 +1787,8 @@ hint.oltr.0.at="isa"
# PCI Ethernet NICs that use the common MII bus controller code.
device dc # DEC/Intel 21143 and various workalikes
+device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+hint.fxp.0.prefer_iomap="0"
device rl # RealTek 8129/8139
device pcn # AMD Am79C79x PCI 10/100 NICs
device sf # Adaptec AIC-6915 (``Starfire'')
@@ -1800,8 +1802,6 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
-device fxp # Intel EtherExpress PRO/100B (82557, 82558)
-hint.fxp.0.prefer_iomap="0"
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Gigabit & FDDI NICs.
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 4d73aa7..c660ea3 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -161,7 +161,6 @@ device ppi # Parallel port interface device
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
-device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device vx # 3Com 3c590, 3c595 (``Vortex'')
device wx # Intel Gigabit Ethernet Card (``Wiseman'')
@@ -169,6 +168,7 @@ device wx # Intel Gigabit Ethernet Card (``Wiseman'')
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
device dc # DEC/Intel 21143 and various workalikes
+device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device pcn # AMD Am79C79x PCI 10/100 NICs
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (``Starfire'')
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 0add3b5..1175d4b 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1787,6 +1787,8 @@ hint.oltr.0.at="isa"
# PCI Ethernet NICs that use the common MII bus controller code.
device dc # DEC/Intel 21143 and various workalikes
+device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+hint.fxp.0.prefer_iomap="0"
device rl # RealTek 8129/8139
device pcn # AMD Am79C79x PCI 10/100 NICs
device sf # Adaptec AIC-6915 (``Starfire'')
@@ -1800,8 +1802,6 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
-device fxp # Intel EtherExpress PRO/100B (82557, 82558)
-hint.fxp.0.prefer_iomap="0"
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Gigabit & FDDI NICs.
OpenPOWER on IntegriCloud