diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:32:50 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:32:50 +0200 |
commit | f9892a52e2405b4c5fa205d4f18ad292cb7e40bb (patch) | |
tree | 04a74c1f32047f1fbaa69cc34b484f91013e6f42 /sound/core/Makefile | |
parent | 6c5cb93b1e87be56d7f00767fd12cf57852a0b9f (diff) | |
parent | cc6a8acdeee932f6911d8b236d2c7d6bcc4616f6 (diff) | |
download | op-kernel-dev-f9892a52e2405b4c5fa205d4f18ad292cb7e40bb.zip op-kernel-dev-f9892a52e2405b4c5fa205d4f18ad292cb7e40bb.tar.gz |
Merge branch 'topic/dma-sgbuf' into for-linus
* topic/dma-sgbuf:
ALSA: Fix SG-buffer DMA with non-coherent architectures
Diffstat (limited to 'sound/core/Makefile')
-rw-r--r-- | sound/core/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile index 4229052..350a08d 100644 --- a/sound/core/Makefile +++ b/sound/core/Makefile @@ -13,7 +13,7 @@ snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ pcm_memory.o snd-page-alloc-y := memalloc.o -snd-page-alloc-$(CONFIG_HAS_DMA) += sgbuf.o +snd-page-alloc-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o snd-rawmidi-objs := rawmidi.o snd-timer-objs := timer.o |