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

[pandora-kernel.git] / arch / mips / kernel / scall64-o32.S

diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index fd2019c..76167be 100644 (file)
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -247,7 +247,7 @@ sys_call_table:
        PTR     sys_mkdir
        PTR     sys_rmdir                       /* 4040 */
        PTR     sys_dup
-       PTR     sys_pipe
+       PTR     sysm_pipe
        PTR     compat_sys_times
        PTR     sys_ni_syscall
        PTR     sys_brk                         /* 4045 */
@@ -526,4 +526,7 @@ sys_call_table:
        PTR     sys_ni_syscall
        PTR     sys_eventfd
        PTR     sys32_fallocate                 /* 4320 */
+       PTR     sys_timerfd_create
+       PTR     sys_timerfd_gettime
+       PTR     sys_timerfd_settime
        .size   sys_call_table,.-sys_call_table