summaryrefslogtreecommitdiffstats
path: root/include/sound/driver.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 17:41:58 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 17:41:58 +0200
commit7b70888a192eff457c2ca0a4ffa04815f5e19734 (patch)
tree8c75d6908b1e83b750b50e7a26da867926e0f5cd /include/sound/driver.h
parent[PATCH] speed up on find_first_bit for i386 (let compiler do the work) (diff)
parent[ALSA] version 1.0.9b (diff)
downloadlinux-7b70888a192eff457c2ca0a4ffa04815f5e19734.tar.xz
linux-7b70888a192eff457c2ca0a4ffa04815f5e19734.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'include/sound/driver.h')
-rw-r--r--include/sound/driver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/driver.h b/include/sound/driver.h
index 948e9a1aebef..0d12456ec3ae 100644
--- a/include/sound/driver.h
+++ b/include/sound/driver.h
@@ -51,7 +51,7 @@
#ifdef CONFIG_SND_DEBUG_MEMORY
#include <linux/slab.h>
#include <linux/vmalloc.h>
-void *snd_wrapper_kmalloc(size_t, int);
+void *snd_wrapper_kmalloc(size_t, unsigned int __nocast);
#undef kmalloc
void snd_wrapper_kfree(const void *);
#undef kfree