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

Commit 9aebddd1 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

be2net: Move the Emulex driver 



Moves the Emulex driver into drivers/net/ethernet/emulex/ and
make the necessary Kconfig and Makefile changes.

CC: Sathya Perla <sathya.perla@emulex.com>
CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
CC: Ajit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 874aeea5

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5746,7 +5746,7 @@ M: Ajit Khaparde <ajit.khaparde@emulex.com> 
L:	netdev@vger.kernel.org

W:	http://www.emulex.com

S:	Supported

F:	drivers/net/benet/

F:	drivers/net/ethernet/emulex/benet/



SFC NETWORK DRIVER

M:	Solarflare linux maintainers <linux-net-drivers@solarflare.com>

drivers/net/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -1598,8 +1598,6 @@ config BNA 


	  <http://support.brocade.com>



source "drivers/net/benet/Kconfig"



endif # NETDEV_10000



source "drivers/net/tokenring/Kconfig"

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o 
obj-$(CONFIG_TEHUTI) += tehuti.o

obj-$(CONFIG_ENIC) += enic/

obj-$(CONFIG_JME) += jme.o

obj-$(CONFIG_BE2NET) += benet/

obj-$(CONFIG_VMXNET3) += vmxnet3/

obj-$(CONFIG_BNA) += bna/

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ source "drivers/net/ethernet/8390/Kconfig" 
source "drivers/net/ethernet/amd/Kconfig"

source "drivers/net/ethernet/broadcom/Kconfig"

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

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

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

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

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

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ 
obj-$(CONFIG_NET_VENDOR_AMD) += amd/

obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/

obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/

obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/

obj-$(CONFIG_NET_VENDOR_INTEL) += intel/

obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/

obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/