diff options
author | David S. Miller <davem@davemloft.net> | 2011-09-16 07:09:02 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-16 07:09:02 +0200 |
commit | 52b9aca7ae8726d1fb41b97dd1d243d107fef11b (patch) | |
tree | 7acee111840bd25183513e9bde08e939ffd57be8 /arch/mips/kernel/scall64-o32.S | |
parent | pch_gbe: support ML7831 IOH (diff) | |
parent | e1000: Fix driver to be used on PA RISC C8000 workstations (diff) | |
download | linux-52b9aca7ae8726d1fb41b97dd1d243d107fef11b.tar.xz linux-52b9aca7ae8726d1fb41b97dd1d243d107fef11b.zip |
Merge branch 'master' of ../netdev/
Diffstat (limited to 'arch/mips/kernel/scall64-o32.S')
-rw-r--r-- | arch/mips/kernel/scall64-o32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 46c4763edf21..4d7c9827706f 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S @@ -392,7 +392,7 @@ sys_call_table: PTR sys_getresuid PTR sys_ni_syscall /* was query_module */ PTR sys_poll - PTR compat_sys_nfsservctl + PTR sys_ni_syscall /* was nfsservctl */ PTR sys_setresgid /* 4190 */ PTR sys_getresgid PTR sys_prctl |