Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

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

diff --git a/include/asm-blackfin/unistd.h b/include/asm-blackfin/unistd.h
index 07ffe8b718c51a0d379ec07d43b5277c20a63eda..c18a399f6e3ed863a64693eeaa573b04465cd0d0 100644 (file)
--- a/include/asm-blackfin/unistd.h
+++ b/include/asm-blackfin/unistd.h
@@ -361,7 +361,7 @@
 #define __NR_epoll_pwait       346
 #define __NR_utimensat         347
 #define __NR_signalfd          348
-#define __NR_timerfd           349
+#define __NR_timerfd_create    349
 #define __NR_eventfd           350
 #define __NR_pread64           351
 #define __NR_pwrite64          352
@@ -369,8 +369,11 @@
 #define __NR_set_robust_list   354
 #define __NR_get_robust_list   355
 #define __NR_fallocate         356
+#define __NR_semtimedop                357
+#define __NR_timerfd_settime   358
+#define __NR_timerfd_gettime   359
 
-#define __NR_syscall           357
+#define __NR_syscall           360
 #define NR_syscalls            __NR_syscall
 
 /* Old optional stuff no one actually uses */