diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 15:41:58 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 15:41:58 (GMT) |
commit | 7b70888a192eff457c2ca0a4ffa04815f5e19734 (patch) | |
tree | 8c75d6908b1e83b750b50e7a26da867926e0f5cd /sound/core/wrappers.c | |
parent | cd85c8b4457a52d3545fdb9532082b2c1ebd5f21 (diff) | |
parent | 0a97af41b0e77f834acc0870155de616a373e899 (diff) | |
download | linux-fsl-qoriq-7b70888a192eff457c2ca0a4ffa04815f5e19734.tar.xz |
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 9f39302..508e6d6 100644 --- a/sound/core/wrappers.c +++ b/sound/core/wrappers.c @@ -27,7 +27,7 @@ #include <linux/fs.h> #ifdef CONFIG_SND_DEBUG_MEMORY -void *snd_wrapper_kmalloc(size_t size, int flags) +void *snd_wrapper_kmalloc(size_t size, unsigned int __nocast flags) { return kmalloc(size, flags); } |