From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 28 Oct 2013 15:08:27 +0000 (+0100)
Subject: ALSA: memalloc: Yet another ifdef CONFIG_GENERIC_ALLOCATOR protection
X-Git-Tag: v3.13-rc1~2^2~101
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63437313daaf90b372d5b383a8cc6ec8dce185fa;p=kernel%2Fkernel-generic.git

ALSA: memalloc: Yet another ifdef CONFIG_GENERIC_ALLOCATOR protection

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>
---

diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 51a7921..809fd79 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -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 */
 
 /*