diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-06-09 14:57:51 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-06-09 22:10:06 +0200 |
| commit | 8272115578ce02566b4c6bbe45f09d0d55f4a1c6 (patch) | |
| tree | 543f421931fb6ff8f1c45ed8ebce2d3b4a9737ad | |
| parent | 0181307abc1d2eb2a0dead93870bcffadddb827c (diff) | |
| download | lwn-8272115578ce02566b4c6bbe45f09d0d55f4a1c6.tar.gz lwn-8272115578ce02566b4c6bbe45f09d0d55f4a1c6.zip | |
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>
| -rw-r--r-- | sound/Kconfig | 2 | ||||
| -rw-r--r-- | sound/isa/Kconfig | 1 | ||||
| -rw-r--r-- | sound/pci/Kconfig | 1 | ||||
| -rw-r--r-- | sound/synth/Kconfig | 2 | ||||
| -rw-r--r-- | sound/synth/emux/Makefile | 4 |
5 files changed, 7 insertions, 3 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index d2fadbec8d51..d7d2aac9542e 100644 --- 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 bf1ab340e2a7..ea8ecc5bb826 100644 --- 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 bc7acb489a43..9ac9326f28d6 100644 --- 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 index 000000000000..dfe8950e0556 --- /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 fb761c2c2b50..4599108452fd 100644 --- 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 |