Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d39db3b4 authored by Jon Mason's avatar Jon Mason Committed by David S. Miller
Browse files

net: change Exar/Neterion menu items to be alphabetical 



Neterion was standalone for several years, then acquired by Exar and
shutdown in 11 months without ever making any new Exar branded adapters.
Users would probably think of them as Neterion and not Exar (as there
have been no follow-on adapters and the vast majority ever sold were
under the Neterion name).

6c541b45 ("net: ethernet: Sort Kconfig sourcing alphabetically")
sorted Kconfig sourcing based on directory names, but in a couple cases,
the menu item text is quite different from the directory name and is not
sorted correctly:

  drivers/net/ethernet/neterion/Kconfig    => "Exar devices"

To address that and clear up any confusion about the name, "Exar" was
changed to "Neterion (Exar)" and the relevant entries in the Makefile
and Kconfig were reordered to match the alphabetical organization.

Inspired-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 969d5090

drivers/net/ethernet/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ source "drivers/net/ethernet/huawei/Kconfig" 
source "drivers/net/ethernet/i825xx/Kconfig"

source "drivers/net/ethernet/ibm/Kconfig"

source "drivers/net/ethernet/intel/Kconfig"

source "drivers/net/ethernet/neterion/Kconfig"

source "drivers/net/ethernet/xscale/Kconfig"



config JME
@@ -128,6 +127,7 @@ config FEALNX 
	  cards. <http://www.myson.com.tw/>



source "drivers/net/ethernet/natsemi/Kconfig"

source "drivers/net/ethernet/neterion/Kconfig"

source "drivers/net/ethernet/netronome/Kconfig"

source "drivers/net/ethernet/ni/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"

drivers/net/ethernet/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ obj-$(CONFIG_NET_VENDOR_DEC) += dec/ 
obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/

obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/

obj-$(CONFIG_NET_VENDOR_EZCHIP) += ezchip/

obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/

obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/

obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/

obj-$(CONFIG_NET_VENDOR_FUJITSU) += fujitsu/
@@ -60,6 +59,7 @@ obj-$(CONFIG_NET_VENDOR_MOXART) += moxa/ 
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/

obj-$(CONFIG_FEALNX) += fealnx.o

obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/

obj-$(CONFIG_NET_VENDOR_NETERION) += neterion/

obj-$(CONFIG_NET_VENDOR_NETRONOME) += netronome/

obj-$(CONFIG_NET_VENDOR_NI) += ni/

obj-$(CONFIG_NET_NETX) += netx-eth.o

drivers/net/ethernet/neterion/Kconfig

+14 −9
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Exar device configuration

#



config NET_VENDOR_EXAR

	bool "Exar devices"

config NET_VENDOR_NETERION

	bool "Neterion (Exar) devices"

	default y

	depends on PCI

	---help---
@@ -11,16 +11,19 @@ config NET_VENDOR_EXAR 


	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  the questions about Exar cards. If you say Y, you will be asked for

	  your specific card in the following questions.

	  the questions about Neterion/Exar cards. If you say Y, you will be

	  asked for your specific card in the following questions.



if NET_VENDOR_EXAR

if NET_VENDOR_NETERION



config S2IO

	tristate "Exar Xframe 10Gb Ethernet Adapter"

	tristate "Neterion (Exar) Xframe 10Gb Ethernet Adapter"

	depends on PCI

	---help---

	  This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.

	  These were originally released from S2IO, which renamed itself

	  Neterion.  So, the adapters might be labeled as either one, depending

	  on its age.



	  More specific information on configuring the driver is in

	  <file:Documentation/networking/s2io.txt>.
@@ -29,11 +32,13 @@ config S2IO 
	  will be called s2io.



config VXGE

	tristate "Exar X3100 Series 10GbE PCIe Server Adapter"

	tristate "Neterion (Exar) X3100 Series 10GbE PCIe Server Adapter"

	depends on PCI

	---help---

	  This driver supports Exar Corp's X3100 Series 10 GbE PCIe

	  I/O Virtualized Server Adapter.

	  I/O Virtualized Server Adapter.  These were originally released from

	  Neterion, which was later acquired by Exar.  So, the adapters might be

	  labeled as either one, depending on its age.



	  More specific information on configuring the driver is in

	  <file:Documentation/networking/vxge.txt>.
@@ -50,4 +55,4 @@ config VXGE_DEBUG_TRACE_ALL 
	  the vxge driver. By default only few debug trace statements are

	  enabled.



endif # NET_VENDOR_EXAR
 
endif # NET_VENDOR_NETERION