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 'hid-suspend' into picolcd
[pandora-kernel.git]
/
arch
/
mn10300
/
kernel
/
process.c
diff --git
a/arch/mn10300/kernel/process.c
b/arch/mn10300/kernel/process.c
index
ec8a21d
..
82b817c
100644
(file)
--- a/
arch/mn10300/kernel/process.c
+++ b/
arch/mn10300/kernel/process.c
@@
-18,7
+18,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/user.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/user.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
@@
-26,6
+25,7
@@
#include <linux/percpu.h>
#include <linux/err.h>
#include <linux/fs.h>
#include <linux/percpu.h>
#include <linux/err.h>
#include <linux/fs.h>
+#include <linux/slab.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/system.h>