diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-15 01:02:28 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-15 01:02:28 +0200 |
commit | 1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (patch) | |
tree | 09fa867d9d9db6ed475eaa889da143603441e1a6 /arch/mips/kernel/scall64-n32.S | |
parent | Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into dev... (diff) | |
parent | ARM: zImage: prevent constant copy+rebuild of lib1funcs.S (diff) | |
download | linux-1db3706b05b11abcf2673ffbed5ad43b4c90ed11.tar.xz linux-1db3706b05b11abcf2673ffbed5ad43b4c90ed11.zip |
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/mips/kernel/scall64-n32.S')
-rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index b85842fc87ae..f9296e894e46 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S @@ -294,7 +294,7 @@ EXPORT(sysn32_call_table) PTR sys_ni_syscall /* 6170, was get_kernel_syms */ PTR sys_ni_syscall /* was query_module */ PTR sys_quotactl - PTR compat_sys_nfsservctl + PTR sys_ni_syscall /* was nfsservctl */ PTR sys_ni_syscall /* res. for getpmsg */ PTR sys_ni_syscall /* 6175 for putpmsg */ PTR sys_ni_syscall /* res. for afs_syscall */ |