Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-x86 / unistd_64.h

diff --git a/include/asm-x86/unistd_64.h b/include/asm-x86/unistd_64.h
index d2284b43ad58408439d958a4e16ca498e40889a9..3a341d791792ad41999893f7034e529cce28e880 100644 (file)
--- a/include/asm-x86/unistd_64.h
+++ b/include/asm-x86/unistd_64.h
@@ -645,12 +645,14 @@ __SYSCALL(__NR_paccept, sys_paccept)
 __SYSCALL(__NR_signalfd4, sys_signalfd4)
 #define __NR_eventfd2                          290
 __SYSCALL(__NR_eventfd2, sys_eventfd2)
-#define __NR_epoll_create2                     291
-__SYSCALL(__NR_epoll_create2, sys_epoll_create2)
+#define __NR_epoll_create1                     291
+__SYSCALL(__NR_epoll_create1, sys_epoll_create1)
 #define __NR_dup3                              292
 __SYSCALL(__NR_dup3, sys_dup3)
 #define __NR_pipe2                             293
 __SYSCALL(__NR_pipe2, sys_pipe2)
+#define __NR_inotify_init1                     294
+__SYSCALL(__NR_inotify_init1, sys_inotify_init1)
 
 
 #ifndef __NO_STUBS