Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[karo-tx-linux.git] / arch / frv / kernel / ptrace.c

diff --git a/arch/frv/kernel/ptrace.c b/arch/frv/kernel/ptrace.c
index f953484e7d596eced5666356750f6ef72f2239f6..ce88fb95ee59e5ce213d3c4a660e27e3fe9b4cbf 100644 (file)
--- a/arch/frv/kernel/ptrace.c
+++ b/arch/frv/kernel/ptrace.c
@@ -14,11 +14,9 @@
 #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>
-#include <linux/config.h>
 #include <linux/security.h>
 #include <linux/signal.h>