diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /arch/mips/kernel/scall64-o32.S | |
parent | 143070e74630b9557e1bb64d899ff2cc5a1dcb48 (diff) | |
parent | 947391cfbaa3b08558844c0b187bcd0223c3f660 (diff) |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/mips/kernel/scall64-o32.S')
-rw-r--r-- | arch/mips/kernel/scall64-o32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 002fac27021e..a5598b2339dd 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
@@ -525,8 +525,8 @@ sys_call_table: | |||
525 | PTR sys_eventfd | 525 | PTR sys_eventfd |
526 | PTR sys32_fallocate /* 4320 */ | 526 | PTR sys32_fallocate /* 4320 */ |
527 | PTR sys_timerfd_create | 527 | PTR sys_timerfd_create |
528 | PTR sys_timerfd_gettime | 528 | PTR compat_sys_timerfd_gettime |
529 | PTR sys_timerfd_settime | 529 | PTR compat_sys_timerfd_settime |
530 | PTR compat_sys_signalfd4 | 530 | PTR compat_sys_signalfd4 |
531 | PTR sys_eventfd2 /* 4325 */ | 531 | PTR sys_eventfd2 /* 4325 */ |
532 | PTR sys_epoll_create1 | 532 | PTR sys_epoll_create1 |