diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /include/asm-ia64/unistd.h | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'include/asm-ia64/unistd.h')
| -rw-r--r-- | include/asm-ia64/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index 6d96a67439be..2bf543493cb8 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
| @@ -265,7 +265,7 @@ | |||
| 265 | #define __NR_keyctl 1273 | 265 | #define __NR_keyctl 1273 |
| 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 | /* 1276 is available for reuse (was briefly sys_set_zone_reclaim) */ |
| 269 | #define __NR_inotify_init 1277 | 269 | #define __NR_inotify_init 1277 |
| 270 | #define __NR_inotify_add_watch 1278 | 270 | #define __NR_inotify_add_watch 1278 |
| 271 | #define __NR_inotify_rm_watch 1279 | 271 | #define __NR_inotify_rm_watch 1279 |