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

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

davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers 



Move the Texas Instruments drivers to drivers/net/ethernet/ti/ and
make the necessary Kconfig and Makefile changes.

CC: Sriram <srk@ti.com>
CC: Vinay Hegde <vinay.hegde@ti.com>
CC: Cyril Chemparathy <cyril@ti.com>
CC: Samuel Chessman <chessman@tux.org>
CC: <torben.mathiasen@compaq.com>
CC: Eugene Konev <ejka@imfi.kspu.ru>
CC: Florian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent de69a4f2

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1908,7 +1908,7 @@ CPMAC ETHERNET DRIVER 
M:	Florian Fainelli <florian@openwrt.org>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/cpmac.c

F:	drivers/net/ethernet/ti/cpmac.c



CPU FREQUENCY DRIVERS

M:	Dave Jones <davej@redhat.com>
@@ -6420,7 +6420,7 @@ L: tlan-devel@lists.sourceforge.net (subscribers-only) 
W:	http://sourceforge.net/projects/tlan/

S:	Maintained

F:	Documentation/networking/tlan.txt

F:	drivers/net/tlan.*

F:	drivers/net/ethernet/ti/tlan.*



TOMOYO SECURITY MODULE

M:	Kentaro Takeda <takedakn@nttdata.co.jp>

drivers/net/Kconfig

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

	  will be called netx-eth.



config TI_DAVINCI_EMAC

	tristate "TI DaVinci EMAC Support"

	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )

	select TI_DAVINCI_MDIO

	select TI_DAVINCI_CPDMA

	select PHYLIB

	help

	  This driver supports TI's DaVinci Ethernet .



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

	  will be called davinci_emac_driver.  This is recommended.



config TI_DAVINCI_MDIO

	tristate "TI DaVinci MDIO Support"

	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )

	select PHYLIB

	help

	  This driver supports TI's DaVinci MDIO module.



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

	  will be called davinci_mdio.  This is recommended.



config TI_DAVINCI_CPDMA

	tristate "TI DaVinci CPDMA Support"

	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )

	help

	  This driver supports TI's DaVinci CPDMA dma engine.



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

	  will be called davinci_cpdma.  This is recommended.



config DM9000

	tristate "DM9000 support"

	depends on ARM || BLACKFIN || MIPS
@@ -500,31 +469,6 @@ config R6040 
	  To compile this driver as a module, choose M here: the module

	  will be called r6040. This is recommended.



config TLAN

	tristate "TI ThunderLAN support"

	depends on NET_PCI && (PCI || EISA)

	---help---

	  If you have a PCI Ethernet network card based on the ThunderLAN chip

	  which is supported by this driver, say Y and read the

	  Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  Devices currently supported by this driver are Compaq Netelligent,

	  Compaq NetFlex and Olicom cards.  Please read the file

	  <file:Documentation/networking/tlan.txt> for more details.



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

	  will be called tlan.



	  Please email feedback to <torben.mathiasen@compaq.com>.



config CPMAC

	tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"

	depends on NET_ETHERNET && EXPERIMENTAL && AR7

	select PHYLIB

	help

	  TI AR7 CPMAC Ethernet support



config NET_POCKET

	bool "Pocket and portable adapters"

	depends on PARPORT

drivers/net/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -5,11 +5,6 @@ 
obj-$(CONFIG_MII) += mii.o

obj-$(CONFIG_MDIO) += mdio.o

obj-$(CONFIG_PHYLIB) += phy/



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_IP1000) += ipg.o

obj-$(CONFIG_CAN) += can/

obj-$(CONFIG_BONDING) += bonding/
@@ -23,7 +18,6 @@ obj-$(CONFIG_PLIP) += plip.o 


obj-$(CONFIG_ROADRUNNER) += rrunner.o



obj-$(CONFIG_TLAN) += tlan.o

obj-$(CONFIG_R6040) += r6040.o

obj-$(CONFIG_YELLOWFIN) += yellowfin.o

obj-$(CONFIG_FEALNX) += fealnx.o
@@ -67,7 +61,6 @@ obj-$(CONFIG_IFB) += ifb.o 
obj-$(CONFIG_MACVLAN) += macvlan.o

obj-$(CONFIG_MACVTAP) += macvtap.o

obj-$(CONFIG_DEFXX) += defxx.o

obj-$(CONFIG_CPMAC) += cpmac.o

obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_KORINA) += korina.o

obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o

drivers/net/ethernet/Kconfig

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

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

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

source "drivers/net/ethernet/ti/Kconfig"

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

source "drivers/net/ethernet/tundra/Kconfig"

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

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ 
obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/

obj-$(CONFIG_NET_VENDOR_SUN) += sun/

obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/

obj-$(CONFIG_NET_VENDOR_TI) += ti/

obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/

obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/

obj-$(CONFIG_NET_VENDOR_VIA) += via/