summaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu/unistd.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-31 10:06:46 +0000
committerAnton Altaparmakov <aia21@cantab.net>2005-10-31 10:06:46 +0000
commit1f04c0a24b2f3cfe89c802a24396263623e3512d (patch)
treed7e2216b6e65b833c0c2b79b478d13ce17dbf296 /include/asm-m68knommu/unistd.h
parent07b188ab773e183871e57b33ae37bf635c9f12ba (diff)
parente2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff)
downloadop-kernel-dev-1f04c0a24b2f3cfe89c802a24396263623e3512d.zip
op-kernel-dev-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.gz
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/asm-m68knommu/unistd.h')
-rw-r--r--include/asm-m68knommu/unistd.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h
index 84b6fa1..5373988 100644
--- a/include/asm-m68knommu/unistd.h
+++ b/include/asm-m68knommu/unistd.h
@@ -504,7 +504,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
unsigned long fd, unsigned long pgoff);
asmlinkage int sys_execve(char *name, char **argv, char **envp);
asmlinkage int sys_pipe(unsigned long *fildes);
-asmlinkage int sys_ptrace(long request, long pid, long addr, long data);
struct pt_regs;
int sys_request_irq(unsigned int,
irqreturn_t (*)(int, void *, struct pt_regs *),
OpenPOWER on IntegriCloud