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 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux...
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
compat_linux.c
diff --git
a/arch/s390/kernel/compat_linux.c
b/arch/s390/kernel/compat_linux.c
index
11c3aba
..
73b624e
100644
(file)
--- a/
arch/s390/kernel/compat_linux.c
+++ b/
arch/s390/kernel/compat_linux.c
@@
-29,7
+29,6
@@
#include <linux/sem.h>
#include <linux/msg.h>
#include <linux/shm.h>
#include <linux/sem.h>
#include <linux/msg.h>
#include <linux/shm.h>
-#include <linux/slab.h>
#include <linux/uio.h>
#include <linux/quota.h>
#include <linux/module.h>
#include <linux/uio.h>
#include <linux/quota.h>
#include <linux/module.h>
@@
-52,6
+51,7
@@
#include <linux/ptrace.h>
#include <linux/fadvise.h>
#include <linux/ipc.h>
#include <linux/ptrace.h>
#include <linux/fadvise.h>
#include <linux/ipc.h>
+#include <linux/slab.h>
#include <asm/types.h>
#include <asm/uaccess.h>
#include <asm/types.h>
#include <asm/uaccess.h>