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 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
[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
f7a7e86
..
c7df0a6
100644
(file)
--- a/
arch/powerpc/platforms/cell/spufs/file.c
+++ b/
arch/powerpc/platforms/cell/spufs/file.c
@@
-32,7
+32,6
@@
#include <linux/marker.h>
#include <asm/io.h>
-#include <asm/semaphore.h>
#include <asm/spu.h>
#include <asm/spu_info.h>
#include <asm/uaccess.h>