diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-13 05:26:33 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 05:26:33 +0100 |
| commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
| tree | 8f582294a655f70496cd08aedeb86de31dbad140 /include/asm-m68knommu/unistd.h | |
| parent | pasemi_mac: basic ethtool support (diff) | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
| download | linux-bed04a4413376265746053be2a9cfbfc80c98ec9.tar.xz linux-bed04a4413376265746053be2a9cfbfc80c98ec9.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-m68knommu/unistd.h')
| -rw-r--r-- | include/asm-m68knommu/unistd.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h index 27c2f9bb4dbd..4ba98b9c5d79 100644 --- a/include/asm-m68knommu/unistd.h +++ b/include/asm-m68knommu/unistd.h @@ -321,13 +321,15 @@ #define __NR_epoll_pwait 315 #define __NR_utimensat 316 #define __NR_signalfd 317 -#define __NR_timerfd 318 +#define __NR_timerfd_create 318 #define __NR_eventfd 319 #define __NR_fallocate 320 +#define __NR_timerfd_settime 321 +#define __NR_timerfd_gettime 322 #ifdef __KERNEL__ -#define NR_syscalls 321 +#define NR_syscalls 323 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR |