Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[firefly-linux-kernel-4.4.55.git] / net / dsa / Kconfig

diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index 274791cd7a35df1274e9120d199af84ea9f60dd0..f5eede1d6cb8eb92cbf97b1b37de1362f13ac095 100644 (file)
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -1,26 +1,24 @@
+config HAVE_NET_DSA
+       def_bool y
+       depends on NETDEVICES && !S390
+
+# Drivers must select NET_DSA and the appropriate tagging format
+
 config NET_DSA
-       tristate "Distributed Switch Architecture support"
-       default n
-       depends on EXPERIMENTAL && NETDEVICES && !S390
+       tristate
+       depends on HAVE_NET_DSA
        select PHYLIB
-       ---help---
-         This allows you to use hardware switch chips that use
-         the Distributed Switch Architecture.
-
 
 if NET_DSA
 
 # tagging formats
 config NET_DSA_TAG_DSA
        bool
-       default n
 
 config NET_DSA_TAG_EDSA
        bool
-       default n
 
 config NET_DSA_TAG_TRAILER
        bool
-       default n
 
 endif