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 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
cell
/
spufs
/
file.c
diff --git
a/arch/powerpc/platforms/cell/spufs/file.c
b/arch/powerpc/platforms/cell/spufs/file.c
index 64a4c2d85f7cbd22671544a7ec3a65aac6fb37e9..5c2808252516500b9d8871dfea5c5e78f67f4268 100644
(file)
--- a/
arch/powerpc/platforms/cell/spufs/file.c
+++ b/
arch/powerpc/platforms/cell/spufs/file.c
@@
-29,6
+29,7
@@
#include <linux/poll.h>
#include <linux/ptrace.h>
#include <linux/seq_file.h>
+#include <linux/slab.h>
#include <asm/io.h>
#include <asm/time.h>