diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2009-06-10 07:26:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2009-06-10 07:26:48 +0200 |
| commit | 4ef279205a1ca4c37bf80811dd9d0f65c854fbf7 (patch) | |
| tree | 69b16d8f4c43ab66417e9b14abbddaa82d8a0222 /sound/pci | |
| parent | Merge branch 'topic/section-fix' into for-linus (diff) | |
| parent | ALSA: clean up the logic for building sequencer modules (diff) | |
| download | linux-4ef279205a1ca4c37bf80811dd9d0f65c854fbf7.tar.gz linux-4ef279205a1ca4c37bf80811dd9d0f65c854fbf7.tar.bz2 linux-4ef279205a1ca4c37bf80811dd9d0f65c854fbf7.zip | |
Merge branch 'topic/seq-kconfig-cleanup' into for-linus
* topic/seq-kconfig-cleanup:
ALSA: clean up the logic for building sequencer modules
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/emu10k1/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/pci/emu10k1/Makefile b/sound/pci/emu10k1/Makefile index cf2d5636d8be..fc5591e7777e 100644 --- a/sound/pci/emu10k1/Makefile +++ b/sound/pci/emu10k1/Makefile @@ -9,15 +9,7 @@ snd-emu10k1-objs := emu10k1.o emu10k1_main.o \ snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o snd-emu10k1x-objs := emu10k1x.o -# -# this function returns: -# "m" - CONFIG_SND_SEQUENCER is m -# <empty string> - CONFIG_SND_SEQUENCER is undefined -# otherwise parameter #1 value -# -sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) - # Toplevel Module Dependency obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o -obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-emu10k1-synth.o +obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emu10k1-synth.o obj-$(CONFIG_SND_EMU10K1X) += snd-emu10k1x.o |