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/sh/kernel/syscalls_32.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/sh/kernel/syscalls_32.S')
-rw-r--r-- | arch/sh/kernel/syscalls_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S index 39b051de4c7c..293e39c59c00 100644 --- a/arch/sh/kernel/syscalls_32.S +++ b/arch/sh/kernel/syscalls_32.S @@ -185,7 +185,7 @@ ENTRY(sys_call_table) .long sys_ni_syscall /* vm86 */ .long sys_ni_syscall /* old "query_module" */ .long sys_poll - .long sys_nfsservctl + .long sys_ni_syscall /* was nfsservctl */ .long sys_setresgid16 /* 170 */ .long sys_getresgid16 .long sys_prctl |