diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
| commit | 0dbd888936a23514716b8d944775bc56f731363a (patch) | |
| tree | a2c60cdc45bdcbed47680731fa8188bffe58c098 /include/asm-frv/unistd.h | |
| parent | 0b442d2c28479332610c46e1a74e5638ab63a97d (diff) | |
| parent | d395991c117d43bfca97101a931a41d062a93852 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-frv/unistd.h')
| -rw-r--r-- | include/asm-frv/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h index e8c986667532..f184eb8c047c 100644 --- a/include/asm-frv/unistd.h +++ b/include/asm-frv/unistd.h | |||
| @@ -328,9 +328,11 @@ | |||
| 328 | #define __NR_epoll_pwait 319 | 328 | #define __NR_epoll_pwait 319 |
| 329 | #define __NR_utimensat 320 | 329 | #define __NR_utimensat 320 |
| 330 | #define __NR_signalfd 321 | 330 | #define __NR_signalfd 321 |
| 331 | /* #define __NR_timerfd 322 removed */ | 331 | #define __NR_timerfd_create 322 |
| 332 | #define __NR_eventfd 323 | 332 | #define __NR_eventfd 323 |
| 333 | #define __NR_fallocate 324 | 333 | #define __NR_fallocate 324 |
| 334 | #define __NR_timerfd_settime 325 | ||
| 335 | #define __NR_timerfd_gettime 326 | ||
| 334 | 336 | ||
| 335 | #ifdef __KERNEL__ | 337 | #ifdef __KERNEL__ |
| 336 | 338 | ||