Commit 82721155 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: synth: Select snd-emux-synth explicitly

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 0181307a
...@@ -110,6 +110,8 @@ source "sound/soc/Kconfig" ...@@ -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
......
...@@ -389,6 +389,7 @@ config SND_SBAWE_SEQ ...@@ -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"
......
...@@ -482,6 +482,7 @@ config SND_EMU10K1_SEQ ...@@ -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)"
......
config SND_SYNTH_EMUX
tristate
...@@ -8,6 +8,4 @@ snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \ ...@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment