diff options
author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /include/asm-sh64/unistd.h | |
parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) |
Merge from-linus to-akpm
Diffstat (limited to 'include/asm-sh64/unistd.h')
-rw-r--r-- | include/asm-sh64/unistd.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-sh64/unistd.h b/include/asm-sh64/unistd.h index 95f0b130405c..2a1cfa404ea4 100644 --- a/include/asm-sh64/unistd.h +++ b/include/asm-sh64/unistd.h | |||
@@ -338,8 +338,13 @@ | |||
338 | #define __NR_add_key 313 | 338 | #define __NR_add_key 313 |
339 | #define __NR_request_key 314 | 339 | #define __NR_request_key 314 |
340 | #define __NR_keyctl 315 | 340 | #define __NR_keyctl 315 |
341 | #define __NR_ioprio_set 316 | ||
342 | #define __NR_ioprio_get 317 | ||
343 | #define __NR_inotify_init 318 | ||
344 | #define __NR_inotify_add_watch 319 | ||
345 | #define __NR_inotify_rm_watch 320 | ||
341 | 346 | ||
342 | #define NR_syscalls 316 | 347 | #define NR_syscalls 321 |
343 | 348 | ||
344 | /* user-visible error numbers are in the range -1 - -125: see <asm-sh64/errno.h> */ | 349 | /* user-visible error numbers are in the range -1 - -125: see <asm-sh64/errno.h> */ |
345 | 350 | ||