Merge tag 'gpio-v4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[mirror_ubuntu-zesty-kernel.git] / sound / firewire / Kconfig

diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
index e92a6d949847a3fbc3de4ad7edc2ecd6026fbae3..2a779c2f63abc7978842890b815c700b5ab50236 100644 (file)
--- a/sound/firewire/Kconfig
+++ b/sound/firewire/Kconfig
@@ -39,6 +39,7 @@ config SND_OXFW
           * Mackie(Loud) d.2 pro/d.4 pro
           * Mackie(Loud) U.420/U.420d
           * TASCAM FireOne
+          * Stanton Controllers & Systems 1 Deck/Mixer
 
          To compile this driver as a module, choose M here: the module
          will be called snd-oxfw.
@@ -53,17 +54,6 @@ config SND_ISIGHT
          To compile this driver as a module, choose M here: the module
          will be called snd-isight.
 
-config SND_SCS1X
-       tristate "Stanton Control System 1 MIDI"
-       select SND_FIREWIRE_LIB
-       help
-         Say Y here to include support for the MIDI ports of the Stanton
-         SCS.1d/SCS.1m DJ controllers.  (SCS.1m audio is still handled
-         by FFADO.)
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-scs1x.
-
 config SND_FIREWORKS
        tristate "Echo Fireworks board module support"
        select SND_FIREWIRE_LIB