Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / sh / kernel / ptrace.c

diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c
index 3887b4f6feb26778cb7bc9fc1962993835356ea5..04ca13a041c160127077dddab6cfd507368fb319 100644 (file)
--- a/arch/sh/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace.c
@@ -9,7 +9,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -225,7 +224,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
        case PTRACE_SETDSPREGS: {
                unsigned long dp;
-               int i;
 
                ret = -EIO;
                dp = ((unsigned long) child) + THREAD_SIZE -