svn commit: r240098 - in head/sys: amd64/conf conf i386/conf

[John Baldwin]

Author: jhb
Date: Tue Sep  4 19:19:36 2012
New Revision: 240098
URL: http://svn.freebsd.org/changeset/base/240098

Log:
  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.

Modified:
  head/sys/amd64/conf/NOTES
  head/sys/conf/NOTES
  head/sys/i386/conf/NOTES

Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES	Tue Sep  4 19:14:57 2012	(r240097)
+++ head/sys/amd64/conf/NOTES	Tue Sep  4 19:19:36 2012	(r240098)
@@ -306,8 +306,6 @@ options 	DRM_DEBUG	# Include debug print
 # 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
 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 NI
 #   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
 
 #

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Tue Sep  4 19:14:57 2012	(r240097)
+++ head/sys/conf/NOTES	Tue Sep  4 19:19:36 2012	(r240098)
@@ -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.

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES	Tue Sep  4 19:14:57 2012	(r240097)
+++ head/sys/i386/conf/NOTES	Tue Sep  4 19:19:36 2012	(r240098)
@@ -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 NI
 #   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
 
 #