diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
| commit | b4b7a4ef097f288f724420b473dbf92a89c0ab7e (patch) | |
| tree | 23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7 /arch/m68k/kernel/entry.S | |
| parent | e9ce335df51ff782035a15c261a3c0c9892a1767 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/m68k/kernel/entry.S')
| -rw-r--r-- | arch/m68k/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index e136b8cbe9b9..2391bdff0996 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
| @@ -510,7 +510,7 @@ sys_call_table: | |||
| 510 | .long sys_settimeofday | 510 | .long sys_settimeofday |
| 511 | .long sys_getgroups16 /* 80 */ | 511 | .long sys_getgroups16 /* 80 */ |
| 512 | .long sys_setgroups16 | 512 | .long sys_setgroups16 |
| 513 | .long old_select | 513 | .long sys_old_select |
| 514 | .long sys_symlink | 514 | .long sys_symlink |
| 515 | .long sys_lstat | 515 | .long sys_lstat |
| 516 | .long sys_readlink /* 85 */ | 516 | .long sys_readlink /* 85 */ |
| @@ -518,7 +518,7 @@ sys_call_table: | |||
| 518 | .long sys_swapon | 518 | .long sys_swapon |
| 519 | .long sys_reboot | 519 | .long sys_reboot |
| 520 | .long sys_old_readdir | 520 | .long sys_old_readdir |
| 521 | .long old_mmap /* 90 */ | 521 | .long sys_old_mmap /* 90 */ |
| 522 | .long sys_munmap | 522 | .long sys_munmap |
| 523 | .long sys_truncate | 523 | .long sys_truncate |
| 524 | .long sys_ftruncate | 524 | .long sys_ftruncate |