]> git.baikalelectronics.ru Git - kernel.git/commit
ALSA: Fix forgotten dependency fix for tristate OSS sequencer kconfig
authorTakashi Iwai <tiwai@suse.de>
Wed, 28 Jun 2017 06:13:41 +0000 (08:13 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 28 Jun 2017 06:45:07 +0000 (08:45 +0200)
commitaa46e80c719c738d9f07b6cc6c7f6f576261d2f4
treed072c2d84c4609c331be9c566255836427a986ee
parentd9affd13ce772879e98cc6cead50ad1bdba4bffd
ALSA: Fix forgotten dependency fix for tristate OSS sequencer kconfig

In the commit e618b8e3bfb5 ("ALSA: seq: Allow the tristate build of
OSS emulation") we changed CONFIG_SND_SEQUENCER_OSS to tristate, but a
couple of places were forgotten, namely, opl3 and emux Makefile.
These contain the line like
  snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o
and this doesn't work any longer as expected because snd-opl3-synth
can be built-in while CONFIG_SND_SEQUENCER_OSS=m.

This patch fixes these places to build properly for the new kconfig
dependency.  In the end, we had to use ifneq() to satisfy the
requirement.  It's a bit ugly, but lesser evil.

Fixes: e618b8e3bfb5 ("ALSA: seq: Allow the tristate build of OSS emulation")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/drivers/opl3/Makefile
sound/synth/emux/Makefile