git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/nomm' into for-linus
[sfrench/cifs-2.6.git]
/
sound
/
core
/
pcm_memory.c
diff --git
a/sound/core/pcm_memory.c
b/sound/core/pcm_memory.c
index d6d49d6651f9122a389572db10d4f2ff078bbec2..917e4055ee30fdc37d6726e8af2f8d4d07506410 100644
(file)
--- a/
sound/core/pcm_memory.c
+++ b/
sound/core/pcm_memory.c
@@
-22,6
+22,7
@@
#include <asm/io.h>
#include <linux/time.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/moduleparam.h>
#include <linux/vmalloc.h>
#include <sound/core.h>