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 'master' into export-slabh
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
setup.c
diff --git
a/arch/powerpc/platforms/pseries/setup.c
b/arch/powerpc/platforms/pseries/setup.c
index
ca5f2e1
..
6710761
100644
(file)
--- a/
arch/powerpc/platforms/pseries/setup.c
+++ b/
arch/powerpc/platforms/pseries/setup.c
@@
-23,7
+23,6
@@
#include <linux/mm.h>
#include <linux/stddef.h>
#include <linux/unistd.h>
#include <linux/mm.h>
#include <linux/stddef.h>
#include <linux/unistd.h>
-#include <linux/slab.h>
#include <linux/user.h>
#include <linux/tty.h>
#include <linux/major.h>
#include <linux/user.h>
#include <linux/tty.h>
#include <linux/major.h>