Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / sound / synth / emux / Makefile

diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile
index 328594e6152dc4670dcf897829c95ccd1b31986d..fb761c2c2b50fd7ae91d0d47aeb2922d20130c07 100644 (file)
--- 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