diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 11:41:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 11:41:58 -0400 |
| commit | 7b70888a192eff457c2ca0a4ffa04815f5e19734 (patch) | |
| tree | 8c75d6908b1e83b750b50e7a26da867926e0f5cd /sound/core/wrappers.c | |
| parent | cd85c8b4457a52d3545fdb9532082b2c1ebd5f21 (diff) | |
| parent | 0a97af41b0e77f834acc0870155de616a373e899 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/core/wrappers.c')
| -rw-r--r-- | sound/core/wrappers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/wrappers.c b/sound/core/wrappers.c index 9f393023c327..508e6d67ee19 100644 --- a/sound/core/wrappers.c +++ b/sound/core/wrappers.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include <linux/fs.h> | 27 | #include <linux/fs.h> |
| 28 | 28 | ||
| 29 | #ifdef CONFIG_SND_DEBUG_MEMORY | 29 | #ifdef CONFIG_SND_DEBUG_MEMORY |
| 30 | void *snd_wrapper_kmalloc(size_t size, int flags) | 30 | void *snd_wrapper_kmalloc(size_t size, unsigned int __nocast flags) |
| 31 | { | 31 | { |
| 32 | return kmalloc(size, flags); | 32 | return kmalloc(size, flags); |
| 33 | } | 33 | } |