ide-cd: add TEAC CD-224E to the NO_AUTOCLOSE list

[linux-2.6-omap-h63xx.git] / net / dsa / Kconfig

diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index 79bcd76d3f10386c64d2c74c028a48aa5c08b401..49211b35725ba74c5661717522075e7b968f303f 100644 (file)
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -1,7 +1,8 @@
 menuconfig NET_DSA
        bool "Distributed Switch Architecture support"
        default n
-       depends on EXPERIMENTAL
+       depends on EXPERIMENTAL && !S390
+       select PHYLIB
        ---help---
          This allows you to use hardware switch chips that use
          the Distributed Switch Architecture.
@@ -18,12 +19,23 @@ config NET_DSA_TAG_EDSA
        bool
        default n
 
+config NET_DSA_TAG_TRAILER
+       bool
+       default n
+
 
 # switch drivers
 config NET_DSA_MV88E6XXX
        bool
        default n
 
+config NET_DSA_MV88E6060
+       bool "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