dsa: Move switch drivers to new directory drivers/net/dsa

Support for specific hardware belongs under drivers/net/ not net/.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

11 files changed, 49 insertions, 46 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index debdf1c07c5..9845afb37cc 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -243,6 +243,8 @@ source "drivers/atm/Kconfig"
 
 source "drivers/net/caif/Kconfig"
 
+source "drivers/net/dsa/Kconfig"
+
 source "drivers/net/ethernet/Kconfig"
 
 source "drivers/net/fddi/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4e4ebfe1aa5..1988881853a 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_CAIF) += caif/
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_ETRAX_ETHERNET) += cris/
+obj-$(CONFIG_NET_DSA) += dsa/
 obj-$(CONFIG_ETHERNET) += ethernet/
 obj-$(CONFIG_FDDI) += fddi/
 obj-$(CONFIG_HIPPI) += hippi/
diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
new file mode 100644
index 00000000000..dd151d53d50
--- /dev/null
+++ b/drivers/net/dsa/Kconfig
@@ -0,0 +1,36 @@
+menu "Distributed Switch Architecture drivers"
+        depends on NET_DSA
+
+config NET_DSA_MV88E6XXX
+        tristate
+        default n
+
+config NET_DSA_MV88E6060
+        tristate "Marvell 88E6060 ethernet switch chip support"
+        select NET_DSA_TAG_TRAILER
+        ---help---
+          This enables support for the Marvell 88E6060 ethernet switch
+          chip.
+
+config NET_DSA_MV88E6XXX_NEED_PPU
+        bool
+        default n
+
+config NET_DSA_MV88E6131
+        tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support"
+        select NET_DSA_MV88E6XXX
+        select NET_DSA_MV88E6XXX_NEED_PPU
+        select NET_DSA_TAG_DSA
+        ---help---
+          This enables support for the Marvell 88E6085/6095/6095F/6131
+          ethernet switch chips.
+
+config NET_DSA_MV88E6123_61_65
+        tristate "Marvell 88E6123/6161/6165 ethernet switch chip support"
+        select NET_DSA_MV88E6XXX
+        select NET_DSA_TAG_EDSA
+        ---help---
+          This enables support for the Marvell 88E6123/6161/6165
+          ethernet switch chips.
+
+endmenu
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
new file mode 100644
index 00000000000..f3bda05536c
--- /dev/null
+++ b/drivers/net/dsa/Makefile
@@ -0,0 +1,9 @@
+obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
+obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx_drv.o
+mv88e6xxx_drv-y += mv88e6xxx.o
+ifdef CONFIG_NET_DSA_MV88E6123_61_65
+mv88e6xxx_drv-y += mv88e6123_61_65.o
+endif
+ifdef CONFIG_NET_DSA_MV88E6131
+mv88e6xxx_drv-y += mv88e6131.o
+endif
diff --git a/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
index 7fc4e81d4d4..7fc4e81d4d4 100644
--- a/net/dsa/mv88e6060.c
+++ b/drivers/net/dsa/mv88e6060.c
diff --git a/net/dsa/mv88e6123_61_65.c b/drivers/net/dsa/mv88e6123_61_65.c
index c0a458fc698..c0a458fc698 100644
--- a/net/dsa/mv88e6123_61_65.c
+++ b/drivers/net/dsa/mv88e6123_61_65.c
diff --git a/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index e0eb6824383..e0eb6824383 100644
--- a/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
diff --git a/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index 5467c040824..5467c040824 100644
--- a/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
diff --git a/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h
index fc2cd7b90e8..fc2cd7b90e8 100644
--- a/net/dsa/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx.h
diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index 7e12303827e..274791cd7a3 100644
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -1,4 +1,4 @@
-menuconfig NET_DSA
+config NET_DSA
         tristate "Distributed Switch Architecture support"
         default n
         depends on EXPERIMENTAL && NETDEVICES && !S390
@@ -23,38 +23,4 @@ config NET_DSA_TAG_TRAILER
         bool
         default n
 
-
-# switch drivers
-config NET_DSA_MV88E6XXX
-        tristate
-        default n
-
-config NET_DSA_MV88E6060
-        tristate "Marvell 88E6060 ethernet switch chip support"
-        select NET_DSA_TAG_TRAILER
-        ---help---
-          This enables support for the Marvell 88E6060 ethernet switch
-          chip.
-
-config NET_DSA_MV88E6XXX_NEED_PPU
-        bool
-        default n
-
-config NET_DSA_MV88E6131
-        tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support"
-        select NET_DSA_MV88E6XXX
-        select NET_DSA_MV88E6XXX_NEED_PPU
-        select NET_DSA_TAG_DSA
-        ---help---
-          This enables support for the Marvell 88E6085/6095/6095F/6131
-          ethernet switch chips.
-
-config NET_DSA_MV88E6123_61_65
-        tristate "Marvell 88E6123/6161/6165 ethernet switch chip support"
-        select NET_DSA_MV88E6XXX
-        select NET_DSA_TAG_EDSA
-        ---help---
-          This enables support for the Marvell 88E6123/6161/6165
-          ethernet switch chips.
-
 endif
diff --git a/net/dsa/Makefile b/net/dsa/Makefile
index 191dd482e55..7b9fcbbeda5 100644
--- a/net/dsa/Makefile
+++ b/net/dsa/Makefile
@@ -6,14 +6,3 @@ dsa_core-y += dsa.o slave.o
 dsa_core-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o
 dsa_core-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o
 dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
-
-# switch drivers
-obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx_drv.o
-mv88e6xxx_drv-y += mv88e6xxx.o
-ifdef CONFIG_NET_DSA_MV88E6123_61_65
-mv88e6xxx_drv-y += mv88e6123_61_65.o
-endif
-ifdef CONFIG_NET_DSA_MV88E6131
-mv88e6xxx_drv-y += mv88e6131.o
-endif