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

Commit a6a5580c authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

enic: Move the Cisco driver 



Move the Cisco driver into drivers/net/ethernet/cisco/ and make the
necessary Kconfig and Makefile changes.

CC: Christian Benvenuti <benve@cisco.com>
CC: Vasanthy Kolluri <vkolluri@cisco.com>
CC: Roopa Prabhu <roprabhu@cisco.com>
CC: David Wang <dwang2@cisco.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9aa32835

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1761,7 +1761,7 @@ M: Vasanthy Kolluri <vkolluri@cisco.com> 
M:	Roopa Prabhu <roprabhu@cisco.com>

M:	David Wang <dwang2@cisco.com>

S:	Supported

F:	drivers/net/enic/

F:	drivers/net/ethernet/cisco/enic/



CIRRUS LOGIC EP93XX ETHERNET DRIVER

M:	Hartley Sweeten <hsweeten@visionengravers.com>

drivers/net/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -1457,12 +1457,6 @@ if NETDEV_10000 
config MDIO

	tristate



config ENIC

	tristate "Cisco VIC Ethernet NIC Support"

	depends on PCI && INET

	help

	  This enables the support for the Cisco VIC Ethernet card.



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
@@ -20,7 +20,6 @@ obj-$(CONFIG_ATL1C) += atl1c/ 
obj-$(CONFIG_GIANFAR) += gianfar_driver.o

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_VMXNET3) += vmxnet3/

drivers/net/ethernet/Kconfig

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

source "drivers/net/ethernet/brocade/Kconfig"

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

source "drivers/net/ethernet/cisco/Kconfig"

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

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

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

drivers/net/ethernet/Makefile

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

obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/

obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/

obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/

obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/

obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/

obj-$(CONFIG_NET_VENDOR_IBM) += ibm/