Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[cascardo/linux.git] / sound / firewire / Kconfig

diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
index b1a1d7d..775ef2e 100644 (file)
--- a/sound/firewire/Kconfig
+++ b/sound/firewire/Kconfig
@@ -9,12 +9,12 @@ if SND_FIREWIRE && FIREWIRE
 
 config SND_FIREWIRE_LIB
        tristate
-       depends on SND_PCM
+       select SND_PCM
+       select SND_RAWMIDI
 
 config SND_DICE
        tristate "DICE-based DACs (EXPERIMENTAL)"
        select SND_HWDEP
-       select SND_PCM
        select SND_FIREWIRE_LIB
        help
          Say Y here to include support for many DACs based on the DICE
@@ -28,7 +28,6 @@ config SND_DICE
 
 config SND_FIREWIRE_SPEAKERS
        tristate "FireWire speakers"
-       select SND_PCM
        select SND_FIREWIRE_LIB
        help
          Say Y here to include support for the Griffin FireWave Surround
@@ -39,7 +38,6 @@ config SND_FIREWIRE_SPEAKERS
 
 config SND_ISIGHT
        tristate "Apple iSight microphone"
-       select SND_PCM
        select SND_FIREWIRE_LIB
        help
          Say Y here to include support for the front and rear microphones
@@ -50,8 +48,6 @@ config SND_ISIGHT
 
 config SND_SCS1X
        tristate "Stanton Control System 1 MIDI"
-       select SND_PCM
-       select SND_RAWMIDI
        select SND_FIREWIRE_LIB
        help
          Say Y here to include support for the MIDI ports of the Stanton
@@ -64,8 +60,6 @@ config SND_SCS1X
 config SND_FIREWORKS
        tristate "Echo Fireworks board module support"
        select SND_FIREWIRE_LIB
-       select SND_RAWMIDI
-       select SND_PCM
        select SND_HWDEP
        help
          Say Y here to include support for FireWire devices based
@@ -82,8 +76,6 @@ config SND_FIREWORKS
 config SND_BEBOB
        tristate "BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware"
        select SND_FIREWIRE_LIB
-       select SND_RAWMIDI
-       select SND_PCM
        select SND_HWDEP
         help
         Say Y here to include support for FireWire devices based
@@ -111,6 +103,11 @@ config SND_BEBOB
          * TerraTec PHASE 24 FW/PHASE X24 FW/PHASE 88 Rack FW
          * Terratec EWS MIC2/EWS MIC4
          * Terratec Aureon 7.1 Firewire
+         * Yamaha GO44/GO46
+         * Focusrite Saffire/Saffire LE/SaffirePro10 IO/SaffirePro26 IO
+         * M-Audio Firewire410/AudioPhile/Solo
+         * M-Audio Ozonic/NRV10/ProfireLightBridge
+         * M-Audio Firewire 1814/ProjectMix IO
 
           To compile this driver as a module, choose M here: the module
           will be called snd-bebob.