Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

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

diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index a626be6..2b73fd1 100644 (file)
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -219,7 +219,7 @@ sys_call_table:
        PTR     sys_readv
        PTR     sys_writev
        PTR     sys_access                      /* 5020 */
-       PTR     sys_pipe
+       PTR     sysm_pipe
        PTR     sys_select
        PTR     sys_sched_yield
        PTR     sys_mremap
@@ -478,4 +478,7 @@ sys_call_table:
        PTR     sys_ni_syscall
        PTR     sys_eventfd
        PTR     sys_fallocate
+       PTR     sys_timerfd_create              /* 5280 */
+       PTR     sys_timerfd_gettime
+       PTR     sys_timerfd_settime
        .size   sys_call_table,.-sys_call_table