diff options
author | John Baldwin <jhb@FreeBSD.org> | 2012-09-04 19:19:36 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2012-09-04 19:19:36 +0000 |
commit | 778eefa40dec79b721b50a18a6635ac642e46b1f (patch) | |
tree | b8a52fff42b5dec44991fda7a78a22362cb0813f /sys | |
parent | db0390e833a279479e229b256dbc6ebb015f9ddc (diff) | |
download | src-778eefa40dec79b721b50a18a6635ac642e46b1f.tar.gz src-778eefa40dec79b721b50a18a6635ac642e46b1f.zip |
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.
Notes
Notes:
svn path=/head/; revision=240098
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/conf/NOTES | 7 | ||||
-rw-r--r-- | sys/conf/NOTES | 3 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 52f97063cc6b..a453cb992166 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 # diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 1a3e71fe2096..ab93a6665dac 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1968,6 +1968,8 @@ device xmphy # XaQti XMAC II # SMC TigerCard 1000 (SMC9462SX), and some Addtron cards. # malo: Marvell Libertas wireless NICs. # mwl: Marvell 88W8363 802.11n wireless NICs. +# Requires the mwl firmware module +# mwlfw: Marvell 88W8363 firmware # msk: Support for gigabit ethernet adapters based on the Marvell/SysKonnect # Yukon II Gigabit controllers, including 88E8021, 88E8022, 88E8061, # 88E8062, 88E8035, 88E8036, 88E8038, 88E8050, 88E8052, 88E8053, @@ -2163,6 +2165,7 @@ device bwi # Broadcom BCM430* BCM431* device bwn # Broadcom BCM43xx device malo # Marvell Libertas wireless NICs. device mwl # Marvell 88W8363 802.11n wireless NICs. +device mwlfw device ral # Ralink Technology RT2500 wireless NICs. # Use sf_buf(9) interface for jumbo buffers on ti(4) controllers. diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 7be3e78cc1fd..1ad040e7e1b7 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -577,8 +577,6 @@ hint.mse.0.irq="5" # 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 # sbni: Granch SBNI12-xx ISA and PCI adapters @@ -624,7 +622,6 @@ hint.le.0.drq="0" 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 sbni @@ -659,7 +656,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 @@ -677,7 +673,6 @@ device iwn5000fw device iwn5150fw device iwn6000fw device iwn6050fw -device mwlfw device wpifw # |