drivers: net: DSA: Sort drivers

With more drivers being added, it is time to sort the drivers to
impose some order.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 862ee22303c22674504be1d1e4622268c583f252..68131a45ac5e75a0d3f1274997bca200733a6118 100644 (file)
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -1,13 +1,7 @@
 menu "Distributed Switch Architecture drivers"
        depends on HAVE_NET_DSA
 
-config NET_DSA_MV88E6060
-       tristate "Marvell 88E6060 ethernet switch chip support"
-       depends on NET_DSA
-       select NET_DSA_TAG_TRAILER
-       ---help---
-         This enables support for the Marvell 88E6060 ethernet switch
-         chip.
+source "drivers/net/dsa/b53/Kconfig"
 
 config NET_DSA_BCM_SF2
        tristate "Broadcom Starfighter 2 Ethernet switch support"
@@ -21,19 +15,6 @@ config NET_DSA_BCM_SF2
          This enables support for the Broadcom Starfighter 2 Ethernet
          switch chips.
 
-source "drivers/net/dsa/b53/Kconfig"
-
-source "drivers/net/dsa/mv88e6xxx/Kconfig"
-
-config NET_DSA_QCA8K
-       tristate "Qualcomm Atheros QCA8K Ethernet switch family support"
-       depends on NET_DSA
-       select NET_DSA_TAG_QCA
-       select REGMAP
-       ---help---
-         This enables support for the Qualcomm Atheros QCA8K Ethernet
-         switch chips.
-
 config NET_DSA_LOOP
        tristate "DSA mock-up Ethernet switch chip support"
        depends on NET_DSA
@@ -50,6 +31,25 @@ config NET_DSA_MT7530
          This enables support for the Mediatek MT7530 Ethernet switch
          chip.
 
+config NET_DSA_MV88E6060
+       tristate "Marvell 88E6060 ethernet switch chip support"
+       depends on NET_DSA
+       select NET_DSA_TAG_TRAILER
+       ---help---
+         This enables support for the Marvell 88E6060 ethernet switch
+         chip.
+
+source "drivers/net/dsa/mv88e6xxx/Kconfig"
+
+config NET_DSA_QCA8K
+       tristate "Qualcomm Atheros QCA8K Ethernet switch family support"
+       depends on NET_DSA
+       select NET_DSA_TAG_QCA
+       select REGMAP
+       ---help---
+         This enables support for the Qualcomm Atheros QCA8K Ethernet
+         switch chips.
+
 config NET_DSA_SMSC_LAN9303
        tristate
        select NET_DSA_TAG_LAN9303

diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
index edd63036173650912ba5e6a058c98d9f31e43393..9613f36083a6dde4123e3fa1196725fcc5591bc1 100644 (file)
--- a/drivers/net/dsa/Makefile
+++ b/drivers/net/dsa/Makefile
@@ -1,11 +1,11 @@
-obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
 obj-$(CONFIG_NET_DSA_BCM_SF2)  += bcm-sf2.o
 bcm-sf2-objs                   := bcm_sf2.o bcm_sf2_cfp.o
-obj-$(CONFIG_NET_DSA_QCA8K)    += qca8k.o
+obj-$(CONFIG_NET_DSA_LOOP)     += dsa_loop.o dsa_loop_bdinfo.o
 obj-$(CONFIG_NET_DSA_MT7530)   += mt7530.o
+obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
+obj-$(CONFIG_NET_DSA_QCA8K)    += qca8k.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) += lan9303_mdio.o
 obj-y                          += b53/
 obj-y                          += mv88e6xxx/
-obj-$(CONFIG_NET_DSA_LOOP)     += dsa_loop.o dsa_loop_bdinfo.o