diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:05:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:05:33 -0400 |
| commit | 10e299fc6d596f4e8476d24ebba1495a8355baff (patch) | |
| tree | f7517eccba4dfc223113961c64429f3986afa8eb /include/asm-ia64/unistd.h | |
| parent | cff93eb3d3244cc117a5204fe1d62102b506afb9 (diff) | |
| parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-ia64/unistd.h')
| -rw-r--r-- | include/asm-ia64/unistd.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index bb0eb727dcd0..f581662c5ab8 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
| @@ -286,8 +286,7 @@ | |||
| 286 | /* 1294, 1295 reserved for pselect/ppoll */ | 286 | /* 1294, 1295 reserved for pselect/ppoll */ |
| 287 | #define __NR_unshare 1296 | 287 | #define __NR_unshare 1296 |
| 288 | #define __NR_splice 1297 | 288 | #define __NR_splice 1297 |
| 289 | #define __NR_set_robust_list 1298 | 289 | /* 1298, 1299 reserved for set_robust_list/get_robust_list */ |
| 290 | #define __NR_get_robust_list 1299 | ||
| 291 | #define __NR_sync_file_range 1300 | 290 | #define __NR_sync_file_range 1300 |
| 292 | #define __NR_tee 1301 | 291 | #define __NR_tee 1301 |
| 293 | #define __NR_vmsplice 1302 | 292 | #define __NR_vmsplice 1302 |