diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-04 16:56:15 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-04 16:56:15 -0400 |
| commit | a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e (patch) | |
| tree | 45692a1b3d770f721f4586ad81c206f1b8509b75 /include/sound/driver.h | |
| parent | 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd (diff) | |
| parent | 1c5ad84516ae7ea4ec868436a910a6bd8d20215a (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'include/sound/driver.h')
| -rw-r--r-- | include/sound/driver.h | 2 |
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 @@ | |||
| 51 | #ifdef CONFIG_SND_DEBUG_MEMORY | 51 | #ifdef CONFIG_SND_DEBUG_MEMORY |
| 52 | #include <linux/slab.h> | 52 | #include <linux/slab.h> |
| 53 | #include <linux/vmalloc.h> | 53 | #include <linux/vmalloc.h> |
| 54 | void *snd_wrapper_kmalloc(size_t, int); | 54 | void *snd_wrapper_kmalloc(size_t, unsigned int __nocast); |
| 55 | #undef kmalloc | 55 | #undef kmalloc |
| 56 | void snd_wrapper_kfree(const void *); | 56 | void snd_wrapper_kfree(const void *); |
| 57 | #undef kfree | 57 | #undef kfree |