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/isa | |
| 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/isa')
| -rw-r--r-- | sound/isa/sb/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/isa/sb/Makefile b/sound/isa/sb/Makefile index 1098a56b2f4..faeffceb01b 100644 --- a/sound/isa/sb/Makefile +++ b/sound/isa/sb/Makefile @@ -13,14 +13,6 @@ snd-sbawe-objs := sbawe.o emu8000.o snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o snd-es968-objs := es968.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_SB_COMMON) += snd-sb-common.o obj-$(CONFIG_SND_SB16_DSP) += snd-sb16-dsp.o @@ -33,4 +25,4 @@ ifeq ($(CONFIG_SND_SB16_CSP),y) obj-$(CONFIG_SND_SB16) += snd-sb16-csp.o obj-$(CONFIG_SND_SBAWE) += snd-sb16-csp.o endif -obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-emu8000-synth.o +obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emu8000-synth.o |