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

[powerpc.git] / include / asm-arm / unistd.h

diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
index 250d7f1..d327b25 100644 (file)
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -367,6 +367,7 @@
 #define __NR_get_robust_list           (__NR_SYSCALL_BASE+339)
 #define __NR_splice                    (__NR_SYSCALL_BASE+340)
 #define __NR_arm_sync_file_range       (__NR_SYSCALL_BASE+341)
+#define __NR_sync_file_range2          __NR_arm_sync_file_range
 #define __NR_tee                       (__NR_SYSCALL_BASE+342)
 #define __NR_vmsplice                  (__NR_SYSCALL_BASE+343)
 #define __NR_move_pages                        (__NR_SYSCALL_BASE+344)
@@ -440,7 +441,6 @@
 /*
  * Unimplemented (or alternatively implemented) syscalls
  */
-#define __IGNORE_sync_file_range       1
 #define __IGNORE_fadvise64_64          1
 
 #endif /* __KERNEL__ */