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

Commit 8df158ac authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

toshiba: Move the Toshiba drivers 



Move the Toshiba ethernet drivers into drivers/net/ethernet/toshiba
and make the necessary Kconfig and Makefile changes.

CC: Geoff Levand <geoff@infradead.org>
CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent bcc9736c

MAINTAINERS

+2 −2
Original line number Original line Diff line number Diff line
@@ -5127,7 +5127,7 @@ M: Geoff Levand <geoff@infradead.org> 
L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

L:	cbe-oss-dev@lists.ozlabs.org

L:	cbe-oss-dev@lists.ozlabs.org

S:	Maintained

S:	Maintained

F:	drivers/net/ps3_gelic_net.*

F:	drivers/net/ethernet/toshiba/ps3_gelic_net.*





PS3 PLATFORM SUPPORT

PS3 PLATFORM SUPPORT

M:	Geoff Levand <geoff@infradead.org>

M:	Geoff Levand <geoff@infradead.org>
@@ -6084,7 +6084,7 @@ M: Jens Osterkamp <jens@de.ibm.com> 
L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

F:	Documentation/networking/spider_net.txt

F:	Documentation/networking/spider_net.txt

F:	drivers/net/spider_net*

F:	drivers/net/ethernet/toshiba/spider_net*





SPU FILE SYSTEM

SPU FILE SYSTEM

M:	Jeremy Kerr <jk@ozlabs.org>

M:	Jeremy Kerr <jk@ozlabs.org>

drivers/net/Kconfig

+0 −37
Original line number Original line Diff line number Diff line
@@ -478,11 +478,6 @@ config FORCEDETH 
	  To compile this driver as a module, choose M here. The module

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

	  will be called forcedeth.

	  will be called forcedeth.





config TC35815

	tristate "TOSHIBA TC35815 Ethernet support"

	depends on NET_PCI && PCI && MIPS

	select PHYLIB



config FEALNX

config FEALNX

	tristate "Myson MTD-8xx PCI Ethernet support"

	tristate "Myson MTD-8xx PCI Ethernet support"

	depends on NET_PCI && PCI

	depends on NET_PCI && PCI
@@ -658,15 +653,6 @@ config SIS190 
	  To compile this driver as a module, choose M here: the module

	  To compile this driver as a module, choose M here: the module

	  will be called sis190.  This is recommended.

	  will be called sis190.  This is recommended.





config SPIDER_NET

	tristate "Spider Gigabit Ethernet driver"

	depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)

	select FW_LOADER

	select SUNGEM_PHY

	help

	  This driver supports the Gigabit Ethernet chips present on the

	  Cell Processor-Based Blades from IBM.



config TSI108_ETH

config TSI108_ETH

	tristate "Tundra TSI108 gigabit Ethernet support"

	tristate "Tundra TSI108 gigabit Ethernet support"

	depends on TSI108_BRIDGE

	depends on TSI108_BRIDGE
@@ -675,29 +661,6 @@ config TSI108_ETH 
	  To compile this driver as a module, choose M here: the module

	  To compile this driver as a module, choose M here: the module

	  will be called tsi108_eth.

	  will be called tsi108_eth.





config GELIC_NET

	tristate "PS3 Gigabit Ethernet driver"

	depends on PPC_PS3

	select PS3_SYS_MANAGER

	help

	  This driver supports the network device on the PS3 game

	  console.  This driver has built-in support for Ethernet.



	  To compile this driver as a module, choose M here: the

	  module will be called ps3_gelic.



config GELIC_WIRELESS

	bool "PS3 Wireless support"

	depends on WLAN

	depends on GELIC_NET

	select WIRELESS_EXT

	help

	  This option adds the support for the wireless feature of PS3.

	  If you have the wireless-less model of PS3 or have no plan to

	  use wireless feature, disabling this option saves memory.  As

	  the driver automatically distinguishes the models, you can

	  safely enable this option even if you have a wireless-less model.



config XILINX_LL_TEMAC

config XILINX_LL_TEMAC

	tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"

	tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"

	depends on PPC || MICROBLAZE

	depends on PPC || MICROBLAZE

drivers/net/Makefile

+0 −6
Original line number Original line Diff line number Diff line
@@ -29,12 +29,6 @@ obj-$(CONFIG_SIS900) += sis900.o 
obj-$(CONFIG_R6040) += r6040.o

obj-$(CONFIG_R6040) += r6040.o

obj-$(CONFIG_YELLOWFIN) += yellowfin.o

obj-$(CONFIG_YELLOWFIN) += yellowfin.o

obj-$(CONFIG_FEALNX) += fealnx.o

obj-$(CONFIG_FEALNX) += fealnx.o

spidernet-y += spider_net.o spider_net_ethtool.o

obj-$(CONFIG_SPIDER_NET) += spidernet.o

obj-$(CONFIG_GELIC_NET) += ps3_gelic.o

gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o

ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)

obj-$(CONFIG_TC35815) += tc35815.o

obj-$(CONFIG_SKFP) += skfp/

obj-$(CONFIG_SKFP) += skfp/

obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o

obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o

obj-$(CONFIG_RIONET) += rionet.o

obj-$(CONFIG_RIONET) += rionet.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ source "drivers/net/ethernet/smsc/Kconfig" 
source "drivers/net/ethernet/stmicro/Kconfig"

source "drivers/net/ethernet/stmicro/Kconfig"

source "drivers/net/ethernet/sun/Kconfig"

source "drivers/net/ethernet/sun/Kconfig"

source "drivers/net/ethernet/tehuti/Kconfig"

source "drivers/net/ethernet/tehuti/Kconfig"

source "drivers/net/ethernet/toshiba/Kconfig"

source "drivers/net/ethernet/via/Kconfig"

source "drivers/net/ethernet/via/Kconfig"





endif # ETHERNET
 
endif # ETHERNET

drivers/net/ethernet/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -39,4 +39,5 @@ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ 
obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/

obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/

obj-$(CONFIG_NET_VENDOR_SUN) += sun/

obj-$(CONFIG_NET_VENDOR_SUN) += sun/

obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/

obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/

obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/

obj-$(CONFIG_NET_VENDOR_VIA) += via/
 
obj-$(CONFIG_NET_VENDOR_VIA) += via/