Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[powerpc.git] / arch / mips / kernel / scall64-n32.S

diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 02c8267..942aca2 100644 (file)
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -273,7 +273,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_pivot_root
        PTR     sys32_sysctl
        PTR     sys_prctl
-       PTR     sys32_adjtimex
+       PTR     compat_sys_adjtimex
        PTR     compat_sys_setrlimit            /* 6155 */
        PTR     sys_chroot
        PTR     sys_sync
@@ -386,3 +386,5 @@ EXPORT(sysn32_call_table)
        PTR     sys_pselect6
        PTR     sys_ppoll                       /* 6265 */
        PTR     sys_unshare
+       PTR     sys_splice
+       PTR     sys_sync_file_range