diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-23 20:38:20 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-23 20:38:20 -0800 |
commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /arch/sh/kernel/syscalls_32.S | |
parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'arch/sh/kernel/syscalls_32.S')
-rw-r--r-- | arch/sh/kernel/syscalls_32.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S index 719e127a7c0..a46cc3a4114 100644 --- a/arch/sh/kernel/syscalls_32.S +++ b/arch/sh/kernel/syscalls_32.S @@ -338,6 +338,8 @@ ENTRY(sys_call_table) .long sys_epoll_pwait .long sys_utimensat /* 320 */ .long sys_signalfd - .long sys_ni_syscall + .long sys_timerfd_create .long sys_eventfd .long sys_fallocate + .long sys_timerfd_settime /* 325 */ + .long sys_timerfd_gettime |