diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:37:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:37:03 -0400 |
| commit | 96fad28a781069eb40156f78b8f50c349805b652 (patch) | |
| tree | 0d428a842ac643176921fcf44e1728ea6ff88690 /include | |
| parent | 3334c39f1815d2911238c43f40840c3c7b378165 (diff) | |
| parent | b833961bd30eec201b9a94eec36aa7ac96f9c9c0 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/unistd.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index 517f1649ee64..3a0c69524656 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
| @@ -266,6 +266,9 @@ | |||
| 266 | #define __NR_ioprio_set 1274 | 266 | #define __NR_ioprio_set 1274 |
| 267 | #define __NR_ioprio_get 1275 | 267 | #define __NR_ioprio_get 1275 |
| 268 | #define __NR_set_zone_reclaim 1276 | 268 | #define __NR_set_zone_reclaim 1276 |
| 269 | #define __NR_inotify_init 1277 | ||
| 270 | #define __NR_inotify_add_watch 1278 | ||
| 271 | #define __NR_inotify_rm_watch 1279 | ||
| 269 | 272 | ||
| 270 | #ifdef __KERNEL__ | 273 | #ifdef __KERNEL__ |
| 271 | 274 | ||