git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.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
d6a519e
..
ab8aef9
100644
(file)
--- a/
arch/powerpc/platforms/cell/spufs/file.c
+++ b/
arch/powerpc/platforms/cell/spufs/file.c
@@
-38,6
+38,7
@@
#include <asm/uaccess.h>
#include "spufs.h"
+#include "sputrace.h"
#define SPUFS_MMAP_4K (PAGE_SIZE == 0x1000)