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

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

ehea/ibm*: Move the IBM drivers 



Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
necessary Kconfig and Makefile changes.

- Renamed ibm_new_emac to emac
- Cleaned up Makefile and Kconfig options which referred to
  IBM_NEW_EMAC to IBM_EMAC
- ibmlana driver is a National Semiconductor SONIC driver so
  it was not moved

CC: Christoph Raisch <raisch@de.ibm.com>
CC: Santiago Leon <santil@linux.vnet.ibm.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: David Gibson <dwg@au1.ibm.com>
CC: Kyle Lucke <klucke@us.ibm.com>
CC: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 86387e1a

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2465,7 +2465,7 @@ EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER 
M:	Breno Leitao <leitao@linux.vnet.ibm.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ehea/

F:	drivers/net/ethernet/ibm/ehea/



EMBEDDED LINUX

M:	Paul Gortmaker <paul.gortmaker@windriver.com>
@@ -3163,7 +3163,7 @@ IBM Power Virtual Ethernet Device Driver 
M:	Santiago Leon <santil@linux.vnet.ibm.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ibmveth.*

F:	drivers/net/ethernet/ibm/ibmveth.*



IBM ServeRAID RAID DRIVER

P:	Jack Hammer

drivers/net/Kconfig

+0 −26
Original line number Diff line number Diff line
@@ -627,18 +627,6 @@ config IBMLANA 
	  boards with this driver should be possible, but has not been tested

	  up to now due to lack of hardware.



config IBMVETH

	tristate "IBM LAN Virtual Ethernet support"

	depends on PPC_PSERIES

	---help---

	  This driver supports virtual ethernet adapters on newer IBM iSeries

	  and pSeries systems.



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

	  be called ibmveth.



source "drivers/net/ibm_newemac/Kconfig"



config NET_PCI

	bool "EISA, VLB, PCI and on board controllers"

	depends on ISA || EISA || PCI
@@ -1469,16 +1457,6 @@ if NETDEV_10000 
config MDIO

	tristate



config EHEA

	tristate "eHEA Ethernet support"

	depends on IBMEBUS && INET && SPARSEMEM

	select INET_LRO

	---help---

	  This driver supports the IBM pSeries eHEA ethernet adapter.



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

	  will be called ehea.



config ENIC

	tristate "Cisco VIC Ethernet NIC Support"

	depends on PCI && INET
@@ -1573,10 +1551,6 @@ config XEN_NETDEV_BACKEND 
	  compile this driver as a module, chose M here: the module

	  will be called xen-netback.



config ISERIES_VETH

	tristate "iSeries Virtual Ethernet driver support"

	depends on PPC_ISERIES



config RIONET

	tristate "RapidIO Ethernet over messaging driver support"

	depends on RAPIDIO

drivers/net/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o 
obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o

obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o



obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/

obj-$(CONFIG_IP1000) += ipg.o

obj-$(CONFIG_EHEA) += ehea/

obj-$(CONFIG_CAN) += can/

obj-$(CONFIG_BONDING) += bonding/

obj-$(CONFIG_ATL1) += atlx/
@@ -50,7 +48,6 @@ obj-$(CONFIG_SIS190) += sis190.o 
obj-$(CONFIG_SIS900) += sis900.o

obj-$(CONFIG_R6040) += r6040.o

obj-$(CONFIG_YELLOWFIN) += yellowfin.o

obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o

obj-$(CONFIG_NATSEMI) += natsemi.o

obj-$(CONFIG_NS83820) += ns83820.o

obj-$(CONFIG_FEALNX) += fealnx.o
@@ -148,7 +145,6 @@ obj-$(CONFIG_VETH) += veth.o 
obj-$(CONFIG_NET_NETX) += netx-eth.o

obj-$(CONFIG_DL2K) += dl2k.o

obj-$(CONFIG_R8169) += r8169.o

obj-$(CONFIG_IBMVETH) += ibmveth.o

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
@@ -19,6 +19,7 @@ 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/ibm/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
@@ -10,6 +10,7 @@ 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_IBM) += ibm/

obj-$(CONFIG_NET_VENDOR_INTEL) += intel/

obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/

obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/