diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 08:41:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 08:41:58 -0700 |
| commit | 7b70888a192eff457c2ca0a4ffa04815f5e19734 (patch) | |
| tree | 8c75d6908b1e83b750b50e7a26da867926e0f5cd /sound/core/memalloc.c | |
| parent | cd85c8b4457a52d3545fdb9532082b2c1ebd5f21 (diff) | |
| parent | 0a97af41b0e77f834acc0870155de616a373e899 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/core/memalloc.c')
| -rw-r--r-- | sound/core/memalloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index dbc23e35fa06..02132561c3f8 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -105,7 +105,8 @@ struct snd_mem_list { */ static void *snd_dma_hack_alloc_coherent(struct device *dev, size_t size, - dma_addr_t *dma_handle, int flags) + dma_addr_t *dma_handle, + unsigned int __nocast flags) { void *ret; u64 dma_mask, coherent_dma_mask; |