net: dsa: microchip: remove NET_DSA_TAG_KSZ_COMMON

Remove the superfluous NET_DSA_TAG_KSZ_COMMON and just use the existing
NET_DSA_TAG_KSZ. Update the description to mention the three switch
families it supports. No functional change.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index 2f69d4b53d465d667e5080f6b03b0d35c8f19a61..29e2bd5cc5af7416ae1231374c5239aaf3126d26 100644 (file)
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -73,16 +73,11 @@ config NET_DSA_TAG_MTK
          Say Y or M if you want to enable support for tagging frames for
          Mediatek switches.
 
-config NET_DSA_TAG_KSZ_COMMON
-       tristate
-       default n
-
 config NET_DSA_TAG_KSZ
-       tristate "Tag driver for Microchip 9893 family of switches"
-       select NET_DSA_TAG_KSZ_COMMON
+       tristate "Tag driver for Microchip 8795/9477/9893 families of switches"
        help
          Say Y if you want to enable support for tagging frames for the
-         Microchip 9893 family of switches.
+         Microchip 8795/9477/9893 families of switches.
 
 config NET_DSA_TAG_QCA
        tristate "Tag driver for Qualcomm Atheros QCA8K switches"

diff --git a/net/dsa/Makefile b/net/dsa/Makefile
index c342f54715ba1a94fba27cf3dfde3311cf8cdffd..2c6d286f05117e838921637275fd7cea8dca3734 100644 (file)
--- a/net/dsa/Makefile
+++ b/net/dsa/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_NET_DSA_TAG_BRCM_COMMON) += tag_brcm.o
 obj-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o
 obj-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o
 obj-$(CONFIG_NET_DSA_TAG_GSWIP) += tag_gswip.o
-obj-$(CONFIG_NET_DSA_TAG_KSZ_COMMON) += tag_ksz.o
+obj-$(CONFIG_NET_DSA_TAG_KSZ) += tag_ksz.o
 obj-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o
 obj-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o
 obj-$(CONFIG_NET_DSA_TAG_QCA) += tag_qca.o