Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 4 insertions, 2 deletions

diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
index fedc4b8e49e2..ce91bb662063 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -328,15 +328,17 @@
 #define __NR_epoll_pwait        303
 #define __NR_utimensat          304
 #define __NR_signalfd           305
-#define __NR_timerfd            306
+#define __NR_timerfd_create     306
 #define __NR_eventfd            307
 #define __NR_sync_file_range2   308
 #define __NR_fallocate          309
 #define __NR_subpage_prot       310
+#define __NR_timerfd_settime    311
+#define __NR_timerfd_gettime    312
 
 #ifdef __KERNEL__
 
-#define __NR_syscalls           311
+#define __NR_syscalls           313
 
 #define __NR__exit __NR_exit
 #define NR_syscalls     __NR_syscalls