Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 112cddca authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarJim Davis <jim.epost@gmail.com>
Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 66470c97

sound/firewire/Kconfig

+2 −10
Original line number Diff line number Diff line
@@ -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