diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:30:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:30:25 -0400 |
| commit | 995a0605a6665858d73f9e80053414909be33f27 (patch) | |
| tree | fcc66a6a77acdaae492f77c0c58c0233db74a2b4 /arch/sh/kernel/syscalls_64.S | |
| parent | a32750c2ca6f697903b19063fc86f4272865e3a1 (diff) | |
| parent | 677d3e2f07d1b3d6d2f76fd5552d16a53b9236a0 (diff) | |
Merge branch 'at91/trng' into next/driver
Diffstat (limited to 'arch/sh/kernel/syscalls_64.S')
| -rw-r--r-- | arch/sh/kernel/syscalls_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S index 089c4d825d08..ceb34b94afa9 100644 --- a/arch/sh/kernel/syscalls_64.S +++ b/arch/sh/kernel/syscalls_64.S | |||
| @@ -189,7 +189,7 @@ sys_call_table: | |||
| 189 | .long sys_ni_syscall /* vm86 */ | 189 | .long sys_ni_syscall /* vm86 */ |
| 190 | .long sys_ni_syscall /* old "query_module" */ | 190 | .long sys_ni_syscall /* old "query_module" */ |
| 191 | .long sys_poll | 191 | .long sys_poll |
| 192 | .long sys_nfsservctl | 192 | .long sys_ni_syscall /* was nfsservctl */ |
| 193 | .long sys_setresgid16 /* 170 */ | 193 | .long sys_setresgid16 /* 170 */ |
| 194 | .long sys_getresgid16 | 194 | .long sys_getresgid16 |
| 195 | .long sys_prctl | 195 | .long sys_prctl |