Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / include / asm-ia64 / unistd.h

diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index 019956c613e4814d9341a912b20457b029470e0b..632f2eedf72c9fab463c74ce682485a576e7c077 100644 (file)
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -285,12 +285,17 @@
 #define __NR_faccessat                 1293
 /* 1294, 1295 reserved for pselect/ppoll */
 #define __NR_unshare                   1296
+#define __NR_splice                    1297
+#define __NR_set_robust_list           1298
+#define __NR_get_robust_list           1299
+#define __NR_sync_file_range           1300
+#define __NR_tee                       1301
+#define __NR_vmsplice                  1302
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
-#define NR_syscalls                    273 /* length of syscall table */
+#define NR_syscalls                    279 /* length of syscall table */
 
 #define __ARCH_WANT_SYS_RT_SIGACTION