diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 01:26:48 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 01:26:48 -0400 |
| commit | 4ef279205a1ca4c37bf80811dd9d0f65c854fbf7 (patch) | |
| tree | 69b16d8f4c43ab66417e9b14abbddaa82d8a0222 /sound/pci | |
| parent | 1282c824cc4ad5b43fc1813e7ea564c0d6f0d046 (diff) | |
| parent | 0528c7494e67c30329d086df141d2dd691f01556 (diff) | |
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 \ | |||
| 9 | snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o | 9 | snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o |
| 10 | snd-emu10k1x-objs := emu10k1x.o | 10 | snd-emu10k1x-objs := emu10k1x.o |
| 11 | 11 | ||
| 12 | # | ||
| 13 | # this function returns: | ||
| 14 | # "m" - CONFIG_SND_SEQUENCER is m | ||
| 15 | # <empty string> - CONFIG_SND_SEQUENCER is undefined | ||
| 16 | # otherwise parameter #1 value | ||
| 17 | # | ||
| 18 | sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) | ||
| 19 | |||
| 20 | # Toplevel Module Dependency | 12 | # Toplevel Module Dependency |
| 21 | obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o | 13 | obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o |
| 22 | obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-emu10k1-synth.o | 14 | obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emu10k1-synth.o |
| 23 | obj-$(CONFIG_SND_EMU10K1X) += snd-emu10k1x.o | 15 | obj-$(CONFIG_SND_EMU10K1X) += snd-emu10k1x.o |