aboutsummaryrefslogtreecommitdiffstats
path: root/sound/synth/emux/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-05-29 07:58:11 +0200
committerTakashi Iwai <tiwai@suse.de>2015-05-29 07:58:11 +0200
commit52262b4a5d7c3d3549985a47d96fe7d661220162 (patch)
tree7803277ddc46447456e77878e7554b6baa050035 /sound/synth/emux/Makefile
parentALSA: emu10k1: Fix/cleanup ifdef CONFIG_PROC_FS (diff)
downloadlinux-dev-52262b4a5d7c3d3549985a47d96fe7d661220162.tar.xz
linux-dev-52262b4a5d7c3d3549985a47d96fe7d661220162.zip
ALSA: emux: Fix/cleanup old ifdef CONFIG_PROC_FS
Build emux_proc.o and drop the unneeded ifdefs. Replace the left CONFIG_PROC with the new CONFIG_SND_PROC_FS. Along with this, fix the build of emux_oss.o in Makefile, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/synth/emux/Makefile')
-rw-r--r--sound/synth/emux/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile
index 328594e6152d..fb761c2c2b50 100644
--- a/sound/synth/emux/Makefile
+++ b/sound/synth/emux/Makefile
@@ -4,8 +4,9 @@
#
snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
- emux_effect.o emux_proc.o emux_hwdep.o soundfont.o \
- $(if $(CONFIG_SND_SEQUENCER_OSS),emux_oss.o)
+ emux_effect.o emux_hwdep.o soundfont.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