diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:03:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:03:38 -0700 |
| commit | 1cce92aef225171705c3f53a871938abca2177de (patch) | |
| tree | a6a4cc523c6918d616ec719b1a3eb8788d64dc3d /arch/avr32/kernel/syscall_table.S | |
| parent | 79d57ab98b7bc32e5bb20683814cfb76dbb54a9e (diff) | |
| parent | 3d431a742728e6b619ce57a030a92d228c13d1d2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: nmi_enter() without nmi_exit()
avr32: fix sys_sync_file_range() call convention
avr32: add generic_find_next_le_bit bit function
avr32: add .gitignore files
atstk1000: fix build breakage with BOARD_ATSTK100X_SW2_CUSTOM=y
Diffstat (limited to 'arch/avr32/kernel/syscall_table.S')
| -rw-r--r-- | arch/avr32/kernel/syscall_table.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S index 478bda4c4a0..7ee0057613b 100644 --- a/arch/avr32/kernel/syscall_table.S +++ b/arch/avr32/kernel/syscall_table.S @@ -275,7 +275,7 @@ sys_call_table: .long sys_set_robust_list .long sys_get_robust_list /* 260 */ .long __sys_splice - .long sys_sync_file_range + .long __sys_sync_file_range .long sys_tee .long sys_vmsplice .long __sys_epoll_pwait /* 265 */ |