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
/
sparc
/
kernel
/
setup_64.c
diff --git
a/arch/sparc/kernel/setup_64.c
b/arch/sparc/kernel/setup_64.c
index
a2a79e7
..
5f72de6
100644
(file)
--- a/
arch/sparc/kernel/setup_64.c
+++ b/
arch/sparc/kernel/setup_64.c
@@
-12,7
+12,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 <asm/smp.h>
#include <linux/user.h>
#include <linux/screen_info.h>
#include <asm/smp.h>
#include <linux/user.h>
#include <linux/screen_info.h>