diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-26 16:06:58 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-26 16:06:58 -0400 |
| commit | f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 (patch) | |
| tree | a453a270fc86ada85d808487c911387739ce2296 /include/asm-powerpc | |
| parent | df8ccb9bf1ca360581a94c2245efb9fa613fbb29 (diff) | |
| parent | 705af309505681f197f81618440954d10f120dc0 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h index 908acb44cb8a..edde2462bf52 100644 --- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h | |||
| @@ -321,8 +321,10 @@ | |||
| 321 | #define __NR_readlinkat 296 | 321 | #define __NR_readlinkat 296 |
| 322 | #define __NR_fchmodat 297 | 322 | #define __NR_fchmodat 297 |
| 323 | #define __NR_faccessat 298 | 323 | #define __NR_faccessat 298 |
| 324 | #define __NR_get_robust_list 299 | ||
| 325 | #define __NR_set_robust_list 300 | ||
| 324 | 326 | ||
| 325 | #define __NR_syscalls 299 | 327 | #define __NR_syscalls 301 |
| 326 | 328 | ||
| 327 | #ifdef __KERNEL__ | 329 | #ifdef __KERNEL__ |
| 328 | #define __NR__exit __NR_exit | 330 | #define __NR__exit __NR_exit |