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

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

diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h
index 27c2f9bb4dbdd7a6528203ccd3a98e95b17486ab..4ba98b9c5d799abc7b6df69f1477bd57fd1d3eaf 100644 (file)
--- a/include/asm-m68knommu/unistd.h
+++ b/include/asm-m68knommu/unistd.h
@@ -321,13 +321,15 @@
 #define __NR_epoll_pwait       315
 #define __NR_utimensat         316
 #define __NR_signalfd          317
-#define __NR_timerfd           318
+#define __NR_timerfd_create    318
 #define __NR_eventfd           319
 #define __NR_fallocate         320
+#define __NR_timerfd_settime   321
+#define __NR_timerfd_gettime   322
 
 #ifdef __KERNEL__
 
-#define NR_syscalls            321
+#define NR_syscalls            323
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR