diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /include/asm-m68k/unistd.h | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-m68k/unistd.h')
| -rw-r--r-- | include/asm-m68k/unistd.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h index 87f77b119317..e72ba563f102 100644 --- a/include/asm-m68k/unistd.h +++ b/include/asm-m68k/unistd.h | |||
| @@ -320,13 +320,15 @@ | |||
| 320 | #define __NR_epoll_pwait 315 | 320 | #define __NR_epoll_pwait 315 |
| 321 | #define __NR_utimensat 316 | 321 | #define __NR_utimensat 316 |
| 322 | #define __NR_signalfd 317 | 322 | #define __NR_signalfd 317 |
| 323 | #define __NR_timerfd 318 | 323 | #define __NR_timerfd_create 318 |
| 324 | #define __NR_eventfd 319 | 324 | #define __NR_eventfd 319 |
| 325 | #define __NR_fallocate 320 | 325 | #define __NR_fallocate 320 |
| 326 | #define __NR_timerfd_settime 321 | ||
| 327 | #define __NR_timerfd_gettime 322 | ||
| 326 | 328 | ||
| 327 | #ifdef __KERNEL__ | 329 | #ifdef __KERNEL__ |
| 328 | 330 | ||
| 329 | #define NR_syscalls 321 | 331 | #define NR_syscalls 323 |
| 330 | 332 | ||
| 331 | #define __ARCH_WANT_IPC_PARSE_VERSION | 333 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 332 | #define __ARCH_WANT_OLD_READDIR | 334 | #define __ARCH_WANT_OLD_READDIR |