Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[linux-2.6-omap-h63xx.git] / arch / mips / kernel / scall64-n32.S

diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 12940eca7893253d097b7effc1d16121b9881328..2654e75d2fef20418ec9a2f638cabd316111af82 100644 (file)
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -141,7 +141,7 @@ EXPORT(sysn32_call_table)
        PTR     compat_sys_readv
        PTR     compat_sys_writev
        PTR     sys_access                      /* 6020 */
-       PTR     sys_pipe
+       PTR     sysm_pipe
        PTR     compat_sys_select
        PTR     sys_sched_yield
        PTR     sys_mremap