diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-05-30 04:15:58 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-05-30 09:22:06 -0400 |
commit | 112cddcada5001985516beda40da2288bd8aede7 (patch) | |
tree | bebc8e38cc27cac2dbfcbd989b41268baaef4e41 /sound/firewire | |
parent | 66470c973c1b000a9830a58f89741704a9136daa (diff) |
ALSA: firewire: Fix dependency on PCM and rawmidi
Now snd-firewire-lib supports rawmidi in addition to PCM, thus we need
to give a proper dependency. For fixing and simplification, move the
selections of SND_PCM and SND_RAWMIDI into SND_FIREWIRE_LIB section.
Then each driver doesn't have to select them but only
SND_FIREWIRE_LIB.
Reported-by: Jim Davis <jim.epost@gmail.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r-- | sound/firewire/Kconfig | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig index 9f363fac7688..775ef2efc296 100644 --- a/sound/firewire/Kconfig +++ b/sound/firewire/Kconfig | |||
@@ -9,12 +9,12 @@ if SND_FIREWIRE && FIREWIRE | |||
9 | 9 | ||
10 | config SND_FIREWIRE_LIB | 10 | config SND_FIREWIRE_LIB |
11 | tristate | 11 | tristate |
12 | depends on SND_PCM | 12 | select SND_PCM |
13 | select SND_RAWMIDI | ||
13 | 14 | ||
14 | config SND_DICE | 15 | config SND_DICE |
15 | tristate "DICE-based DACs (EXPERIMENTAL)" | 16 | tristate "DICE-based DACs (EXPERIMENTAL)" |
16 | select SND_HWDEP | 17 | select SND_HWDEP |
17 | select SND_PCM | ||
18 | select SND_FIREWIRE_LIB | 18 | select SND_FIREWIRE_LIB |
19 | help | 19 | help |
20 | Say Y here to include support for many DACs based on the DICE | 20 | Say Y here to include support for many DACs based on the DICE |
@@ -28,7 +28,6 @@ config SND_DICE | |||
28 | 28 | ||
29 | config SND_FIREWIRE_SPEAKERS | 29 | config SND_FIREWIRE_SPEAKERS |
30 | tristate "FireWire speakers" | 30 | tristate "FireWire speakers" |
31 | select SND_PCM | ||
32 | select SND_FIREWIRE_LIB | 31 | select SND_FIREWIRE_LIB |
33 | help | 32 | help |
34 | Say Y here to include support for the Griffin FireWave Surround | 33 | Say Y here to include support for the Griffin FireWave Surround |
@@ -39,7 +38,6 @@ config SND_FIREWIRE_SPEAKERS | |||
39 | 38 | ||
40 | config SND_ISIGHT | 39 | config SND_ISIGHT |
41 | tristate "Apple iSight microphone" | 40 | tristate "Apple iSight microphone" |
42 | select SND_PCM | ||
43 | select SND_FIREWIRE_LIB | 41 | select SND_FIREWIRE_LIB |
44 | help | 42 | help |
45 | Say Y here to include support for the front and rear microphones | 43 | Say Y here to include support for the front and rear microphones |
@@ -50,8 +48,6 @@ config SND_ISIGHT | |||
50 | 48 | ||
51 | config SND_SCS1X | 49 | config SND_SCS1X |
52 | tristate "Stanton Control System 1 MIDI" | 50 | tristate "Stanton Control System 1 MIDI" |
53 | select SND_PCM | ||
54 | select SND_RAWMIDI | ||
55 | select SND_FIREWIRE_LIB | 51 | select SND_FIREWIRE_LIB |
56 | help | 52 | help |
57 | Say Y here to include support for the MIDI ports of the Stanton | 53 | Say Y here to include support for the MIDI ports of the Stanton |
@@ -64,8 +60,6 @@ config SND_SCS1X | |||
64 | config SND_FIREWORKS | 60 | config SND_FIREWORKS |
65 | tristate "Echo Fireworks board module support" | 61 | tristate "Echo Fireworks board module support" |
66 | select SND_FIREWIRE_LIB | 62 | select SND_FIREWIRE_LIB |
67 | select SND_RAWMIDI | ||
68 | select SND_PCM | ||
69 | select SND_HWDEP | 63 | select SND_HWDEP |
70 | help | 64 | help |
71 | Say Y here to include support for FireWire devices based | 65 | Say Y here to include support for FireWire devices based |
@@ -82,8 +76,6 @@ config SND_FIREWORKS | |||
82 | config SND_BEBOB | 76 | config SND_BEBOB |
83 | tristate "BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware" | 77 | tristate "BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware" |
84 | select SND_FIREWIRE_LIB | 78 | select SND_FIREWIRE_LIB |
85 | select SND_RAWMIDI | ||
86 | select SND_PCM | ||
87 | select SND_HWDEP | 79 | select SND_HWDEP |
88 | help | 80 | help |
89 | Say Y here to include support for FireWire devices based | 81 | Say Y here to include support for FireWire devices based |