ALSA: usb-audio: add support for Akai MPD16

[safe/jmp/linux-2.6] / net / dsa / Kconfig

diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index 505aa14..c51b554 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.
@@ -28,18 +29,25 @@ 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
 
 config NET_DSA_MV88E6131
-       bool "Marvell 88E6131 ethernet switch chip support"
+       bool "Marvell 88E6095/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 88E6131 ethernet switch
-         chip.
+         This enables support for the Marvell 88E6095/6095F/6131
+         ethernet switch chips.
 
 config NET_DSA_MV88E6123_61_65
        bool "Marvell 88E6123/6161/6165 ethernet switch chip support"