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 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
ptrace.c
diff --git
a/arch/ia64/kernel/ptrace.c
b/arch/ia64/kernel/ptrace.c
index
92c9689
..
9daa87f
100644
(file)
--- a/
arch/ia64/kernel/ptrace.c
+++ b/
arch/ia64/kernel/ptrace.c
@@
-15,7
+15,6
@@
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/ptrace.h>
-#include <linux/smp_lock.h>
#include <linux/user.h>
#include <linux/security.h>
#include <linux/audit.h>