diff options
author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /include/asm-blackfin/unistd.h | |
parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-blackfin/unistd.h')
-rw-r--r-- | include/asm-blackfin/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-blackfin/unistd.h b/include/asm-blackfin/unistd.h index 07ffe8b718c5..e98167358d26 100644 --- a/include/asm-blackfin/unistd.h +++ b/include/asm-blackfin/unistd.h | |||
@@ -369,8 +369,9 @@ | |||
369 | #define __NR_set_robust_list 354 | 369 | #define __NR_set_robust_list 354 |
370 | #define __NR_get_robust_list 355 | 370 | #define __NR_get_robust_list 355 |
371 | #define __NR_fallocate 356 | 371 | #define __NR_fallocate 356 |
372 | #define __NR_semtimedop 357 | ||
372 | 373 | ||
373 | #define __NR_syscall 357 | 374 | #define __NR_syscall 358 |
374 | #define NR_syscalls __NR_syscall | 375 | #define NR_syscalls __NR_syscall |
375 | 376 | ||
376 | /* Old optional stuff no one actually uses */ | 377 | /* Old optional stuff no one actually uses */ |