diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
| commit | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (patch) | |
| tree | 9116e5bde860d00685c5b6eee7be5ba9899aabb9 /include/sound/memalloc.h | |
| parent | 972c26bdd6b58e7534473c4f7928584578cf43f4 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/sound/memalloc.h')
| -rw-r--r-- | include/sound/memalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h index 3a2fd2cc9f19..83489c3abbaf 100644 --- a/include/sound/memalloc.h +++ b/include/sound/memalloc.h | |||
| @@ -111,7 +111,7 @@ size_t snd_dma_get_reserved_buf(struct snd_dma_buffer *dmab, unsigned int id); | |||
| 111 | int snd_dma_reserve_buf(struct snd_dma_buffer *dmab, unsigned int id); | 111 | int snd_dma_reserve_buf(struct snd_dma_buffer *dmab, unsigned int id); |
| 112 | 112 | ||
| 113 | /* basic memory allocation functions */ | 113 | /* basic memory allocation functions */ |
| 114 | void *snd_malloc_pages(size_t size, unsigned int gfp_flags); | 114 | void *snd_malloc_pages(size_t size, gfp_t gfp_flags); |
| 115 | void snd_free_pages(void *ptr, size_t size); | 115 | void snd_free_pages(void *ptr, size_t size); |
| 116 | 116 | ||
| 117 | #endif /* __SOUND_MEMALLOC_H */ | 117 | #endif /* __SOUND_MEMALLOC_H */ |