ALSA: memalloc: Yet another ifdef CONFIG_GENERIC_ALLOCATOR protection
authorTakashi Iwai <tiwai@suse.de>
Mon, 28 Oct 2013 15:08:27 +0000 (16:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 28 Oct 2013 15:08:27 +0000 (16:08 +0100)
I obviously forgot to merge the right version...

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/memalloc.c

index 51a79218815bdf00b0858f999e5c6e572c6f76ee..809fd79ecad678ee75836049459fe6eb7ece9c99 100644 (file)
@@ -159,6 +159,7 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
        dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma);
 }
 
+#ifdef CONFIG_GENERIC_ALLOCATOR
 /**
  * snd_malloc_dev_iram - allocate memory from on-chip internal ram
  * @dmab: buffer allocation record to store the allocated data
@@ -198,6 +199,7 @@ void snd_free_dev_iram(struct snd_dma_buffer *dmab)
        if (pool && dmab->area)
                gen_pool_free(pool, (unsigned long)dmab->area, dmab->bytes);
 }
+#endif /* CONFIG_GENERIC_ALLOCATOR */
 #endif /* CONFIG_HAS_DMA */
 
 /*