diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/sh/kernel/syscalls.S | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/sh/kernel/syscalls.S')
| -rw-r--r-- | arch/sh/kernel/syscalls.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/kernel/syscalls.S b/arch/sh/kernel/syscalls.S index 768334e95075..ca81976e9e34 100644 --- a/arch/sh/kernel/syscalls.S +++ b/arch/sh/kernel/syscalls.S | |||
| @@ -351,3 +351,6 @@ ENTRY(sys_call_table) | |||
| 351 | .long sys_sync_file_range | 351 | .long sys_sync_file_range |
| 352 | .long sys_tee /* 315 */ | 352 | .long sys_tee /* 315 */ |
| 353 | .long sys_vmsplice | 353 | .long sys_vmsplice |
| 354 | .long sys_move_pages | ||
| 355 | .long sys_getcpu | ||
| 356 | .long sys_epoll_pwait | ||