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: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/Kconfig b/sound/Kconfig
index d2fadbec8d51e56f08025af15de705ae3ac391bf..d7d2aac9542ea5923e82e5ee7a379fd5ae7383f9 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -110,6 +110,8 @@ source "sound/soc/Kconfig"
 
 source "sound/x86/Kconfig"
 
+source "sound/synth/Kconfig"
+
 endif # SND
 
 menuconfig SOUND_PRIME

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index bf1ab340e2a76cfc9eb62eab56daceb3478896b8..ea8ecc5bb826c419da3b83251c312eee07214757 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -389,6 +389,7 @@ config SND_SBAWE_SEQ
        def_tristate SND_SEQUENCER && SND_SBAWE
        select SND_SEQ_MIDI_EMUL
        select SND_SEQ_VIRMIDI
+       select SND_SYNTH_EMUX
 
 config SND_SB16_CSP
        bool "Sound Blaster 16/AWE CSP support"

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index bc7acb489a43de531344d3a0c86c3ad21c424f2e..9ac9326f28d677d9ce9b92263a552ae74985970d 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -482,6 +482,7 @@ config SND_EMU10K1_SEQ
        def_tristate SND_SEQUENCER && SND_EMU10K1
        select SND_SEQ_MIDI_EMUL
        select SND_SEQ_VIRMIDI
+       select SND_SYNTH_EMUX
 
 config SND_EMU10K1X
        tristate "Emu10k1X (Dell OEM Version)"

diff --git a/sound/synth/Kconfig b/sound/synth/Kconfig
new file mode 100644 (file)
index 0000000..dfe8950
--- /dev/null
+++ b/sound/synth/Kconfig
@@ -0,0 +1,2 @@
+config SND_SYNTH_EMUX
+       tristate

diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile
index fb761c2c2b50fd7ae91d0d47aeb2922d20130c07..4599108452fd149add82a19f7bcc63bcb6fdb8b2 100644 (file)
--- a/sound/synth/emux/Makefile
+++ b/sound/synth/emux/Makefile
@@ -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_SEQUENCER_OSS) += emux_oss.o
 
-# Toplevel Module Dependencies
-obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emux-synth.o
-obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emux-synth.o
+obj-$(CONFIG_SND_SYNTH_EMUX) += snd-emux-synth.o