summaryrefslogtreecommitdiff
path: root/arch/m68knommu/kernel/syscalltable.S
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-09 02:30:55 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-09 02:30:55 +0300
commitd15c22e78674f9a5bc0de0932a43abe1aafae303 (patch)
tree3e4198c44bd2d9184e91647346c66aa95e28f843 /arch/m68knommu/kernel/syscalltable.S
parent0f4954819fb6f840d46076f0dbd313ef5da48f5d (diff)
parentfec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff)
downloadlinux-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.xz
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'arch/m68knommu/kernel/syscalltable.S')
-rw-r--r--arch/m68knommu/kernel/syscalltable.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S
index 812f8d8b7a85..1017e76f3711 100644
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
@@ -18,7 +18,7 @@
.text
ALIGN
ENTRY(sys_call_table)
- .long sys_ni_syscall /* 0 - old "setup()" system call*/
+ .long sys_restart_syscall /* 0 - old "setup()" system call */
.long sys_exit
.long sys_fork
.long sys_read
@@ -107,7 +107,7 @@ ENTRY(sys_call_table)
.long sys_uselib
.long sys_ni_syscall /* sys_swapon */
.long sys_reboot
- .long old_readdir
+ .long sys_old_readdir
.long old_mmap /* 90 */
.long sys_munmap
.long sys_truncate