diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /arch/microblaze/kernel/syscall_table.S | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/microblaze/kernel/syscall_table.S')
| -rw-r--r-- | arch/microblaze/kernel/syscall_table.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S index 216db817beb6..457216097dfd 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S | |||
| @@ -313,7 +313,7 @@ ENTRY(sys_call_table) | |||
| 313 | .long sys_fchmodat | 313 | .long sys_fchmodat |
| 314 | .long sys_faccessat | 314 | .long sys_faccessat |
| 315 | .long sys_ni_syscall /* pselect6 */ | 315 | .long sys_ni_syscall /* pselect6 */ |
| 316 | .long sys_ni_syscall /* sys_ppoll */ | 316 | .long sys_ppoll |
| 317 | .long sys_unshare /* 310 */ | 317 | .long sys_unshare /* 310 */ |
| 318 | .long sys_set_robust_list | 318 | .long sys_set_robust_list |
| 319 | .long sys_get_robust_list | 319 | .long sys_get_robust_list |