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 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
cell
/
spu_priv1_mmio.c
diff --git
a/arch/powerpc/platforms/cell/spu_priv1_mmio.c
b/arch/powerpc/platforms/cell/spu_priv1_mmio.c
index 1410443731eb8b6aab3f7fae2f64b35ca92c5e2a..121aec353f268b007c558258acd206821efd13e8 100644
(file)
--- a/
arch/powerpc/platforms/cell/spu_priv1_mmio.c
+++ b/
arch/powerpc/platforms/cell/spu_priv1_mmio.c
@@
-22,7
+22,6
@@
#include <linux/list.h>
#include <linux/module.h>
#include <linux/ptrace.h>
-#include <linux/slab.h>
#include <linux/wait.h>
#include <linux/mm.h>
#include <linux/io.h>