diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-10 12:43:46 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-10 12:43:46 +1000 |
commit | 55e54fb111789901535f9e042737793be3068725 (patch) | |
tree | 17f903afb4795aaf8225668153f7a8ff4687541c /sound/core/pcm_memory.c | |
parent | ddc5a2d4f129068be392e47f66a90eca43d3a2db (diff) | |
parent | a1510625e80d0c8d066db6a36f124525a92dc3cc (diff) |
Merge commit 'sound/for-next'
Diffstat (limited to 'sound/core/pcm_memory.c')
-rw-r--r-- | sound/core/pcm_memory.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c index a6d42808828c..caa7796bc2f5 100644 --- a/sound/core/pcm_memory.c +++ b/sound/core/pcm_memory.c @@ -304,6 +304,7 @@ int snd_pcm_lib_preallocate_pages_for_all(struct snd_pcm *pcm, EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages_for_all); +#ifdef CONFIG_SND_DMA_SGBUF /** * snd_pcm_sgbuf_ops_page - get the page struct at the given offset * @substream: the pcm substream instance @@ -349,6 +350,7 @@ unsigned int snd_pcm_sgbuf_get_chunk_size(struct snd_pcm_substream *substream, return size; } EXPORT_SYMBOL(snd_pcm_sgbuf_get_chunk_size); +#endif /* CONFIG_SND_DMA_SGBUF */ /** * snd_pcm_lib_malloc_pages - allocate the DMA buffer |