aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-07-30 04:15:34 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-12 06:41:04 -0400
commite75ed60cbaf6a2b5f14f00d96d926110f983be6b (patch)
treefcc6f765bfb782c34381b2801eba3c4d38077c99
parent679ec0ef08afde98fd5b2d1aa9fb3e50cce657a0 (diff)
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 <kong.lai@tundra.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/Kconfig8
-rw-r--r--drivers/net/Makefile1
-rw-r--r--drivers/net/ethernet/Kconfig1
-rw-r--r--drivers/net/ethernet/Makefile1
-rw-r--r--drivers/net/ethernet/tundra/Kconfig28
-rw-r--r--drivers/net/ethernet/tundra/Makefile5
-rw-r--r--drivers/net/ethernet/tundra/tsi108_eth.c (renamed from drivers/net/tsi108_eth.c)0
-rw-r--r--drivers/net/ethernet/tundra/tsi108_eth.h (renamed from drivers/net/tsi108_eth.h)0
8 files changed, 35 insertions, 9 deletions
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
623 To compile this driver as a module, choose M here: the module 623 To compile this driver as a module, choose M here: the module
624 will be called yellowfin. This is recommended. 624 will be called yellowfin. This is recommended.
625 625
626config TSI108_ETH
627 tristate "Tundra TSI108 gigabit Ethernet support"
628 depends on TSI108_BRIDGE
629 help
630 This driver supports Tundra TSI108 gigabit Ethernet ports.
631 To compile this driver as a module, choose M here: the module
632 will be called tsi108_eth.
633
634config XILINX_LL_TEMAC 626config XILINX_LL_TEMAC
635 tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver" 627 tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
636 depends on PPC || MICROBLAZE 628 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
42obj-$(CONFIG_HP100) += hp100.o 42obj-$(CONFIG_HP100) += hp100.o
43obj-$(CONFIG_FORCEDETH) += forcedeth.o 43obj-$(CONFIG_FORCEDETH) += forcedeth.o
44 44
45obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
46ll_temac-objs := ll_temac_main.o ll_temac_mdio.o 45ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
47obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o 46obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
48obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o 47obj-$(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"
52source "drivers/net/ethernet/sun/Kconfig" 52source "drivers/net/ethernet/sun/Kconfig"
53source "drivers/net/ethernet/tehuti/Kconfig" 53source "drivers/net/ethernet/tehuti/Kconfig"
54source "drivers/net/ethernet/toshiba/Kconfig" 54source "drivers/net/ethernet/toshiba/Kconfig"
55source "drivers/net/ethernet/tundra/Kconfig"
55source "drivers/net/ethernet/via/Kconfig" 56source "drivers/net/ethernet/via/Kconfig"
56 57
57endif # ETHERNET 58endif # 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/
43obj-$(CONFIG_NET_VENDOR_SUN) += sun/ 43obj-$(CONFIG_NET_VENDOR_SUN) += sun/
44obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/ 44obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
45obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/ 45obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
46obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
46obj-$(CONFIG_NET_VENDOR_VIA) += via/ 47obj-$(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 @@
1#
2# Tundra network device configuration
3#
4
5config NET_VENDOR_TUNDRA
6 bool "Tundra devices"
7 depends on TSI108_BRIDGE
8 ---help---
9 If you have a network (Ethernet) card belonging to this class, say Y
10 and read the Ethernet-HOWTO, available from
11 <http://www.tldp.org/docs.html#howto>.
12
13 Note that the answer to this question doesn't directly affect the
14 kernel: saying N will just cause the configurator to skip all
15 the questions about Tundra cards. If you say Y, you will be asked for
16 your specific card in the following questions.
17
18if NET_VENDOR_TUNDRA
19
20config TSI108_ETH
21 tristate "Tundra TSI108 gigabit Ethernet support"
22 depends on TSI108_BRIDGE
23 ---help---
24 This driver supports Tundra TSI108 gigabit Ethernet ports.
25 To compile this driver as a module, choose M here: the module
26 will be called tsi108_eth.
27
28endif # 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 @@
1#
2# Makefile for the Tundra network device drivers.
3#
4
5obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 64cb9ac19ed9..64cb9ac19ed9 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
diff --git a/drivers/net/tsi108_eth.h b/drivers/net/ethernet/tundra/tsi108_eth.h
index 5fee7d78dc6d..5fee7d78dc6d 100644
--- a/drivers/net/tsi108_eth.h
+++ b/drivers/net/ethernet/tundra/tsi108_eth.h