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

Commit 86387e1a authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

s2io/vxge: Move the Exar drivers 



Move the Exar drivers into drivers/net/ethernet/neterion/ and make the
necessary Kconfig and Makefile changes.

CC: Jon Mason <jdmason@kudzu.us>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 93f7848b

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -4380,9 +4380,8 @@ W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous 
W:	http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous

S:	Supported

F:	Documentation/networking/s2io.txt

F:	drivers/net/s2io*

F:	Documentation/networking/vxge.txt

F:	drivers/net/vxge/

F:	drivers/net/ethernet/neterion/



NETFILTER/IPTABLES/IPCHAINS

P:	Rusty Russell

drivers/net/Kconfig

+0 −34
Original line number Diff line number Diff line
@@ -1485,40 +1485,6 @@ config ENIC 
	help

	  This enables the support for the Cisco VIC Ethernet card.



config S2IO

	tristate "Exar Xframe 10Gb Ethernet Adapter"

	depends on PCI

	---help---

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



	  More specific information on configuring the driver is in 

	  <file:Documentation/networking/s2io.txt>.



	  To compile this driver as a module, choose M here. The module

	  will be called s2io.



config VXGE

	tristate "Exar X3100 Series 10GbE PCIe Server Adapter"

	depends on PCI && INET

	---help---

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

	  I/O Virtualized Server Adapter.



	  More specific information on configuring the driver is in

	  <file:Documentation/networking/vxge.txt>.



	  To compile this driver as a module, choose M here. The module

	  will be called vxge.



config VXGE_DEBUG_TRACE_ALL

	bool "Enabling All Debug trace statments in driver"

	default n

	depends on VXGE

	---help---

	  Say Y here if you want to enabling all the debug trace statements in

	  the vxge driver. By default only few debug trace statements are

	  enabled.



config PASEMI_MAC

	tristate "PA Semi 1/10Gbit MAC"

	depends on PPC_PASEMI && PCI && INET

drivers/net/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ obj-$(CONFIG_NET_NETX) += netx-eth.o 
obj-$(CONFIG_DL2K) += dl2k.o

obj-$(CONFIG_R8169) += r8169.o

obj-$(CONFIG_IBMVETH) += ibmveth.o

obj-$(CONFIG_S2IO) += s2io.o

obj-$(CONFIG_VXGE) += vxge/

obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o

obj-$(CONFIG_BFIN_MAC) += bfin_mac.o

obj-$(CONFIG_DM9000) += dm9000.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ source "drivers/net/ethernet/broadcom/Kconfig" 
source "drivers/net/ethernet/brocade/Kconfig"

source "drivers/net/ethernet/chelsio/Kconfig"

source "drivers/net/ethernet/emulex/Kconfig"

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

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

source "drivers/net/ethernet/i825xx/Kconfig"

source "drivers/net/ethernet/mellanox/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ 
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/

obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/

obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/

obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/

obj-$(CONFIG_NET_VENDOR_INTEL) += intel/

obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/

obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/