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' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
traps.c
diff --git
a/arch/powerpc/kernel/traps.c
b/arch/powerpc/kernel/traps.c
index
696626a
..
29d128e
100644
(file)
--- a/
arch/powerpc/kernel/traps.c
+++ b/
arch/powerpc/kernel/traps.c
@@
-21,7
+21,6
@@
#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/init.h>