diff options
| author | jhb <jhb@FreeBSD.org> | 2012-09-04 19:19:36 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2012-09-04 19:19:36 +0000 |
| commit | 599115bdcb3939cdc5164a09fd18ccfe4c310ab1 (patch) | |
| tree | b8a52fff42b5dec44991fda7a78a22362cb0813f /sys/amd64/conf/NOTES | |
| parent | 627c3f1a6ea9872fe2d6bfa11c52db7a410b7bb5 (diff) | |
| download | FreeBSD-src-599115bdcb3939cdc5164a09fd18ccfe4c310ab1.zip FreeBSD-src-599115bdcb3939cdc5164a09fd18ccfe4c310ab1.tar.gz | |
Fix duplicate entries for mwl(4):
- Move mwlfw from {amd64,i386}/conf/NOTES to sys/conf/NOTES (mwl(4) is
already present in sys/conf/NOTES).
- Remove duplicate mwl(4) entries from {amd64,i386}/conf/NOTES.
- While here, add a description to the sfxge line in amd64/conf/NOTES.
Diffstat (limited to 'sys/amd64/conf/NOTES')
| -rw-r--r-- | sys/amd64/conf/NOTES | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 52f9706..a453cb9 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -306,8 +306,6 @@ options DRM_DEBUG # Include debug printfs (slow) # mlx4ib: Mellanox ConnectX HCA InfiniBand # mlxen: Mellanox ConnectX HCA Ethernet # mthca: Mellanox HCA InfiniBand -# mwl: Marvell 88W8363 IEEE 802.11 adapter -# Requires the mwl firmware module # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking # sfxge: Solarflare SFC9000 family 10Gb Ethernet adapters @@ -324,10 +322,9 @@ device iwn # Intel 4965/1000/5000/6000 wireless NICs. device mlx4ib # Mellanox ConnectX HCA InfiniBand device mlxen # Mellanox ConnectX HCA Ethernet device mthca # Mellanox HCA InfiniBand -device mwl # Marvell 88W8363 802.11n wireless NICs. device nfe # nVidia nForce MCP on-board Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking -device sfxge +device sfxge # Solarflare SFC9000 10Gb Ethernet device wpi # Intel 3945ABG wireless NICs. # IEEE 802.11 adapter firmware modules @@ -350,7 +347,6 @@ device wpi # Intel 3945ABG wireless NICs. # iwn5150fw: Specific module for the 5150 only # iwn6000fw: Specific module for the 6000 only # iwn6050fw: Specific module for the 6050 only -# mwlfw: Marvell 88W8363 firmware # wpifw: Intel 3945ABG Wireless LAN Controller firmware device iwifw @@ -368,7 +364,6 @@ device iwn5000fw device iwn5150fw device iwn6000fw device iwn6050fw -device mwlfw device wpifw # |
