diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
| commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
| tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /include/asm-i386/unistd.h | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'include/asm-i386/unistd.h')
| -rw-r--r-- | include/asm-i386/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index 597496ed2aee..cf6f2cd9c514 100644 --- a/include/asm-i386/unistd.h +++ b/include/asm-i386/unistd.h | |||
| @@ -315,8 +315,9 @@ | |||
| 315 | #define __NR_faccessat 307 | 315 | #define __NR_faccessat 307 |
| 316 | #define __NR_pselect6 308 | 316 | #define __NR_pselect6 308 |
| 317 | #define __NR_ppoll 309 | 317 | #define __NR_ppoll 309 |
| 318 | #define __NR_unshare 310 | ||
| 318 | 319 | ||
| 319 | #define NR_syscalls 310 | 320 | #define NR_syscalls 311 |
| 320 | 321 | ||
| 321 | /* | 322 | /* |
| 322 | * user-visible error numbers are in the range -1 - -128: see | 323 | * user-visible error numbers are in the range -1 - -128: see |