diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-08 01:14:20 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-08 01:14:20 +0100 |
commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /include/sound/driver.h | |
parent | Merge ../linux-2.6 (diff) | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
download | linux-24bfb00123e82a2e70bd115277d922438813515b.tar.xz linux-24bfb00123e82a2e70bd115277d922438813515b.zip |
Merge ../linux-2.6
Diffstat (limited to 'include/sound/driver.h')
-rw-r--r-- | include/sound/driver.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/sound/driver.h b/include/sound/driver.h index 1ec2fae050a6..3f0416ac24d9 100644 --- a/include/sound/driver.h +++ b/include/sound/driver.h @@ -44,21 +44,4 @@ #include <linux/module.h> -/* - * ========================================================================== - */ - -#ifdef CONFIG_SND_DEBUG_MEMORY -#include <linux/slab.h> -#include <linux/vmalloc.h> -void *snd_wrapper_kmalloc(size_t, gfp_t); -#undef kmalloc -void snd_wrapper_kfree(const void *); -#undef kfree -void *snd_wrapper_vmalloc(size_t); -#undef vmalloc -void snd_wrapper_vfree(void *); -#undef vfree -#endif - #endif /* __SOUND_DRIVER_H */ |