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 'fix/misc' into for-linus
[pandora-kernel.git]
/
arch
/
xtensa
/
kernel
/
process.c
diff --git
a/arch/xtensa/kernel/process.c
b/arch/xtensa/kernel/process.c
index
e1a04a3
..
f167e0f
100644
(file)
--- a/
arch/xtensa/kernel/process.c
+++ b/
arch/xtensa/kernel/process.c
@@
-23,7
+23,6
@@
#include <linux/stddef.h>
#include <linux/unistd.h>
#include <linux/ptrace.h>
#include <linux/stddef.h>
#include <linux/unistd.h>
#include <linux/ptrace.h>
-#include <linux/slab.h>
#include <linux/elf.h>
#include <linux/init.h>
#include <linux/prctl.h>
#include <linux/elf.h>
#include <linux/init.h>
#include <linux/prctl.h>
@@
-31,6
+30,7
@@
#include <linux/module.h>
#include <linux/mqueue.h>
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/mqueue.h>
#include <linux/fs.h>
+#include <linux/slab.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>