Merge ../linux-2.6 by hand

1 files changed, 0 insertions, 1 deletions

diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
index c2d039e338a8..0991dfceef1d 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -486,7 +486,6 @@ int sys_vfork(unsigned long p1, unsigned long p2, unsigned long p3,
                 unsigned long p4, unsigned long p5, unsigned long p6,
                 struct pt_regs *regs);
 int sys_pipe(int __user *fildes);
-int sys_ptrace(long request, long pid, long addr, long data);
 struct sigaction;
 long sys_rt_sigaction(int sig, const struct sigaction __user *act,
                       struct sigaction __user *oact, size_t sigsetsize);