Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[mv-sheeva.git] / arch / mn10300 / kernel / ptrace.c

diff --git a/arch/mn10300/kernel/ptrace.c b/arch/mn10300/kernel/ptrace.c
index e143339ad28e00869d9b23c1d882d994cdd89d62..cf847dabc1bd3a7cd810628ea2500bbfd8b922a7 100644 (file)
--- a/arch/mn10300/kernel/ptrace.c
+++ b/arch/mn10300/kernel/ptrace.c
@@ -13,7 +13,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/user.h>