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

Commit 93f7848b authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

myri*: Move the Myricom drivers 



Move the Myricom drivers into drivers/net/ethernet/myricom/ and make
the necessary Kconfig and Makefile changes.

CC: Andrew Gallatin <gallatin@myri.com>
CC: Brice Goglin <brice@myri.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 5a2cc190

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4335,7 +4335,7 @@ M: Andrew Gallatin <gallatin@myri.com> 
L:	netdev@vger.kernel.org

W:	http://www.myri.com/scs/download-Myri10GE.html

S:	Supported

F:	drivers/net/myri10ge/

F:	drivers/net/ethernet/myricom/myri10ge/



NATSEMI ETHERNET DRIVER (DP8381x)

M:	Tim Hockin <thockin@hockin.org>

drivers/net/Kconfig

+0 −26
Original line number Diff line number Diff line
@@ -1519,32 +1519,6 @@ config VXGE_DEBUG_TRACE_ALL 
	  the vxge driver. By default only few debug trace statements are

	  enabled.



config MYRI10GE

	tristate "Myricom Myri-10G Ethernet support"

	depends on PCI && INET

	select FW_LOADER

	select CRC32

	select INET_LRO

	---help---

	  This driver supports Myricom Myri-10G Dual Protocol interface in

	  Ethernet mode. If the eeprom on your board is not recent enough,

	  you will need a newer firmware image.

	  You may get this image or more information, at:



	  <http://www.myri.com/scs/download-Myri10GE.html>



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

	  will be called myri10ge.



config MYRI10GE_DCA

	bool "Direct Cache Access (DCA) Support"

	default y

	depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)

	---help---

	  Say Y here if you want to use Direct Cache Access (DCA) in the

	  driver.  DCA is a method for warming the CPU cache before data

	  is used, with the intent of lessening the impact of cache misses.



config PASEMI_MAC

	tristate "PA Semi 1/10Gbit MAC"

	depends on PPC_PASEMI && PCI && INET

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ obj-$(CONFIG_R8169) += r8169.o 
obj-$(CONFIG_IBMVETH) += ibmveth.o

obj-$(CONFIG_S2IO) += s2io.o

obj-$(CONFIG_VXGE) += vxge/

obj-$(CONFIG_MYRI10GE) += myri10ge/

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
@@ -21,6 +21,7 @@ source "drivers/net/ethernet/emulex/Kconfig" 
source "drivers/net/ethernet/intel/Kconfig"

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

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

source "drivers/net/ethernet/myricom/Kconfig"

source "drivers/net/ethernet/qlogic/Kconfig"

source "drivers/net/ethernet/racal/Kconfig"

source "drivers/net/ethernet/sfc/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/ 
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/

obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/

obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/

obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/

obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/

obj-$(CONFIG_NET_VENDOR_RACAL) += racal/

obj-$(CONFIG_SFC) += sfc/