Merge branches 'release' and 'dmi' into release

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

diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h
index 7306c71a89262a3fd70c533e8790686ed861bad6..e8c9866675321b1d0c601f500efccf1343a41230 100644 (file)
--- a/include/asm-frv/unistd.h
+++ b/include/asm-frv/unistd.h
@@ -328,12 +328,13 @@
 #define __NR_epoll_pwait       319
 #define __NR_utimensat         320
 #define __NR_signalfd          321
-#define __NR_timerfd           322
+/* #define __NR_timerfd                322 removed */
 #define __NR_eventfd           323
+#define __NR_fallocate         324
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 324
+#define NR_syscalls 325
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 /* #define __ARCH_WANT_OLD_READDIR */