diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /arch/mips/kernel/scall64-o32.S | |
| parent | 69266866a5790080d7fe80094b28d670ff8aa765 (diff) | |
| parent | 3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
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 515f9eab2b2..813689ef238 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -325,7 +325,7 @@ sys_call_table: | |||
| 325 | PTR sys32_sigreturn | 325 | PTR sys32_sigreturn |
| 326 | PTR sys32_clone /* 4120 */ | 326 | PTR sys32_clone /* 4120 */ |
| 327 | PTR sys_setdomainname | 327 | PTR sys_setdomainname |
| 328 | PTR sys_32_newuname | 328 | PTR sys_newuname |
| 329 | PTR sys_ni_syscall /* sys_modify_ldt */ | 329 | PTR sys_ni_syscall /* sys_modify_ldt */ |
| 330 | PTR compat_sys_adjtimex | 330 | PTR compat_sys_adjtimex |
| 331 | PTR sys_mprotect /* 4125 */ | 331 | PTR sys_mprotect /* 4125 */ |