diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-15 06:20:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-15 06:20:44 -0400 |
| commit | 08229de4b42816079ed5d15f0689fcd0af946d5e (patch) | |
| tree | 7126dc7b220fbbce745cb5d9a8864e9690587da4 /sound/synth/emux/Makefile | |
| parent | fbb474dedab871c7382858c374acd287dad4ab38 (diff) | |
| parent | 2a708137fd7d3e0928f27157aaed8aba404b11c9 (diff) | |
Merge branch 'for-2.6.32' into mxc
Conflicts:
sound/soc/Makefile
Diffstat (limited to 'sound/synth/emux/Makefile')
| -rw-r--r-- | sound/synth/emux/Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile index b69035240cf6..328594e6152d 100644 --- a/sound/synth/emux/Makefile +++ b/sound/synth/emux/Makefile | |||
| @@ -7,14 +7,6 @@ snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \ | |||
| 7 | emux_effect.o emux_proc.o emux_hwdep.o soundfont.o \ | 7 | emux_effect.o emux_proc.o emux_hwdep.o soundfont.o \ |
| 8 | $(if $(CONFIG_SND_SEQUENCER_OSS),emux_oss.o) | 8 | $(if $(CONFIG_SND_SEQUENCER_OSS),emux_oss.o) |
| 9 | 9 | ||
| 10 | # | ||
| 11 | # this function returns: | ||
| 12 | # "m" - CONFIG_SND_SEQUENCER is m | ||
| 13 | # <empty string> - CONFIG_SND_SEQUENCER is undefined | ||
| 14 | # otherwise parameter #1 value | ||
| 15 | # | ||
| 16 | sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) | ||
| 17 | |||
| 18 | # Toplevel Module Dependencies | 10 | # Toplevel Module Dependencies |
| 19 | obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-emux-synth.o | 11 | obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emux-synth.o |
| 20 | obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-emux-synth.o | 12 | obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emux-synth.o |