luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: synth: Select snd-emux-synth explicitly

Browse Source 
Instead of the non-standard way to enable the build of snd-emux-synth
module inside Makefile, rewrite Kconfig to select the item explicitly
from each driver (sbawe and emu10k1).  This is the standard way.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2017-06-09 14:57:51 +02:00
parent 0181307abc
commit 8272115578
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/Kconfig
View File

@ -110,6 +110,8 @@ source "sound/soc/Kconfig"
source "sound/x86/Kconfig" source "sound/x86/Kconfig"
source "sound/synth/Kconfig"
endif # SND endif # SND
menuconfig SOUND_PRIME menuconfig SOUND_PRIME

1
sound/isa/Kconfig
View File

@ -389,6 +389,7 @@ config SND_SBAWE_SEQ
def_tristate SND_SEQUENCER && SND_SBAWE def_tristate SND_SEQUENCER && SND_SBAWE
select SND_SEQ_MIDI_EMUL select SND_SEQ_MIDI_EMUL
select SND_SEQ_VIRMIDI select SND_SEQ_VIRMIDI
select SND_SYNTH_EMUX
config SND_SB16_CSP config SND_SB16_CSP
bool "Sound Blaster 16/AWE CSP support" bool "Sound Blaster 16/AWE CSP support"

1
sound/pci/Kconfig
View File

@ -482,6 +482,7 @@ config SND_EMU10K1_SEQ
def_tristate SND_SEQUENCER && SND_EMU10K1 def_tristate SND_SEQUENCER && SND_EMU10K1
select SND_SEQ_MIDI_EMUL select SND_SEQ_MIDI_EMUL
select SND_SEQ_VIRMIDI select SND_SEQ_VIRMIDI
select SND_SYNTH_EMUX
config SND_EMU10K1X config SND_EMU10K1X
tristate "Emu10k1X (Dell OEM Version)" tristate "Emu10k1X (Dell OEM Version)"

2
sound/synth/Kconfig Normal file
View File

@ -0,0 +1,2 @@
config SND_SYNTH_EMUX
tristate

4
sound/synth/emux/Makefile
View File

@ -8,6 +8,4 @@ snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
snd-emux-synth-$(CONFIG_SND_PROC_FS) += emux_proc.o snd-emux-synth-$(CONFIG_SND_PROC_FS) += emux_proc.o
snd-emux-synth-$(CONFIG_SND_SEQUENCER_OSS) += emux_oss.o snd-emux-synth-$(CONFIG_SND_SEQUENCER_OSS) += emux_oss.o
# Toplevel Module Dependencies obj-$(CONFIG_SND_SYNTH_EMUX) += snd-emux-synth.o
obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emux-synth.o
obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emux-synth.o