diff options
| author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
| commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
| tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /include/asm-i386/unistd.h | |
| parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
| parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) | |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'include/asm-i386/unistd.h')
| -rw-r--r-- | include/asm-i386/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index 176413fb9ae3..e25e4c71a879 100644 --- a/include/asm-i386/unistd.h +++ b/include/asm-i386/unistd.h | |||
| @@ -294,8 +294,10 @@ | |||
| 294 | #define __NR_add_key 286 | 294 | #define __NR_add_key 286 |
| 295 | #define __NR_request_key 287 | 295 | #define __NR_request_key 287 |
| 296 | #define __NR_keyctl 288 | 296 | #define __NR_keyctl 288 |
| 297 | #define __NR_ioprio_set 289 | ||
| 298 | #define __NR_ioprio_get 290 | ||
| 297 | 299 | ||
| 298 | #define NR_syscalls 289 | 300 | #define NR_syscalls 291 |
| 299 | 301 | ||
| 300 | /* | 302 | /* |
| 301 | * user-visible error numbers are in the range -1 - -128: see | 303 | * user-visible error numbers are in the range -1 - -128: see |