[IA64] Fix build error: conflicting types for ‘sys_execve’

[net-next-2.6.git] / arch / ia64 / include / asm / unistd.h

diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index bb8b0fff32b3f5c46f9d348f98ebe9a0b2f177ec..954d398a54b4e7f60de2aaeabef172a0774fd93f 100644 (file)
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -312,11 +312,14 @@
 #define __NR_pwritev                   1320
 #define __NR_rt_tgsigqueueinfo         1321
 #define __NR_recvmmsg                  1322
+#define __NR_fanotify_init             1323
+#define __NR_fanotify_mark             1324
+#define __NR_prlimit64                 1325
 
 #ifdef __KERNEL__
 
 
-#define NR_syscalls                    299 /* length of syscall table */
+#define NR_syscalls                    302 /* length of syscall table */
 
 /*
  * The following defines stop scripts/checksyscalls.sh from complaining about
@@ -353,8 +356,6 @@ asmlinkage unsigned long sys_mmap2(
                                int fd, long pgoff);
 struct pt_regs;
 struct sigaction;
-long sys_execve(char __user *filename, char __user * __user *argv,
-                          char __user * __user *envp, struct pt_regs *regs);
 asmlinkage long sys_ia64_pipe(void);
 asmlinkage long sys_rt_sigaction(int sig,
                                 const struct sigaction __user *act,