From e75ed60cbaf6a2b5f14f00d96d926110f983be6b Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sat, 30 Jul 2011 01:15:34 -0700 Subject: [PATCH] tsi108*: Move the Tundra driver Move the Tundra driver to drivers/net/ethernet/tundra/ and make the necessary Kocnfig and Makefile changes. CC: Kong Lai Signed-off-by: Jeff Kirsher --- drivers/net/Kconfig | 8 ------ drivers/net/Makefile | 1 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/tundra/Kconfig | 28 +++++++++++++++++++ drivers/net/ethernet/tundra/Makefile | 5 ++++ .../net/{ => ethernet/tundra}/tsi108_eth.c | 0 .../net/{ => ethernet/tundra}/tsi108_eth.h | 0 8 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 drivers/net/ethernet/tundra/Kconfig create mode 100644 drivers/net/ethernet/tundra/Makefile rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (100%) rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 33df2547e30e..a96cf1871336 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -623,14 +623,6 @@ config YELLOWFIN To compile this driver as a module, choose M here: the module will be called yellowfin. This is recommended. -config TSI108_ETH - tristate "Tundra TSI108 gigabit Ethernet support" - depends on TSI108_BRIDGE - help - This driver supports Tundra TSI108 gigabit Ethernet ports. - To compile this driver as a module, choose M here: the module - will be called tsi108_eth. - config XILINX_LL_TEMAC tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver" depends on PPC || MICROBLAZE diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 3b14f1a2aa53..d7ac2f8e031c 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -42,7 +42,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o obj-$(CONFIG_HP100) += hp100.o obj-$(CONFIG_FORCEDETH) += forcedeth.o -obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o ll_temac-objs := ll_temac_main.o ll_temac_mdio.o obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 3893065d4f8f..8f404ea4f978 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -52,6 +52,7 @@ source "drivers/net/ethernet/stmicro/Kconfig" source "drivers/net/ethernet/sun/Kconfig" source "drivers/net/ethernet/tehuti/Kconfig" source "drivers/net/ethernet/toshiba/Kconfig" +source "drivers/net/ethernet/tundra/Kconfig" source "drivers/net/ethernet/via/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index e1f0b9419a04..6cf7f99fe3d8 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -43,4 +43,5 @@ obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/ obj-$(CONFIG_NET_VENDOR_SUN) += sun/ obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/ obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/ +obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/ obj-$(CONFIG_NET_VENDOR_VIA) += via/ diff --git a/drivers/net/ethernet/tundra/Kconfig b/drivers/net/ethernet/tundra/Kconfig new file mode 100644 index 000000000000..03925d1aecb2 --- /dev/null +++ b/drivers/net/ethernet/tundra/Kconfig @@ -0,0 +1,28 @@ +# +# Tundra network device configuration +# + +config NET_VENDOR_TUNDRA + bool "Tundra devices" + depends on TSI108_BRIDGE + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about Tundra cards. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_TUNDRA + +config TSI108_ETH + tristate "Tundra TSI108 gigabit Ethernet support" + depends on TSI108_BRIDGE + ---help--- + This driver supports Tundra TSI108 gigabit Ethernet ports. + To compile this driver as a module, choose M here: the module + will be called tsi108_eth. + +endif # NET_VENDOR_TUNDRA diff --git a/drivers/net/ethernet/tundra/Makefile b/drivers/net/ethernet/tundra/Makefile new file mode 100644 index 000000000000..439f6930235b --- /dev/null +++ b/drivers/net/ethernet/tundra/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Tundra network device drivers. +# + +obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o diff --git a/drivers/net/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c similarity index 100% rename from drivers/net/tsi108_eth.c rename to drivers/net/ethernet/tundra/tsi108_eth.c diff --git a/drivers/net/tsi108_eth.h b/drivers/net/ethernet/tundra/tsi108_eth.h similarity index 100% rename from drivers/net/tsi108_eth.h rename to drivers/net/ethernet/tundra/tsi108_eth.h -- 2.34.1