X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sound%2Fcore%2Fmemalloc.c;h=9e92441f9b78fb3b51c5924ae1052e980629d1cc;hb=4004f02d7af9bb1f5fd993fba60ed5bd0f5397a9;hp=1b3534d67686d407992b7f712306c43d87e29863;hpb=e21e696edb498c7f7eed42ba3096f6bbe13927b6;p=~andy%2Flinux diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 1b3534d6768..9e92441f9b7 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -199,6 +199,8 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, case SNDRV_DMA_TYPE_DEV: dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr); break; +#endif +#ifdef CONFIG_SND_DMA_SGBUF case SNDRV_DMA_TYPE_DEV_SG: snd_malloc_sgbuf_pages(device, size, dmab, NULL); break; @@ -269,6 +271,8 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab) case SNDRV_DMA_TYPE_DEV: snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); break; +#endif +#ifdef CONFIG_SND_DMA_SGBUF case SNDRV_DMA_TYPE_DEV_SG: snd_free_sgbuf_pages(dmab); break;