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-sh/unistd.h | |
| parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
| parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) | |
Merge from-linus to-akpm
Diffstat (limited to 'include/asm-sh/unistd.h')
| -rw-r--r-- | include/asm-sh/unistd.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h index 4e7701d6d23c..ea89e8f223ea 100644 --- a/include/asm-sh/unistd.h +++ b/include/asm-sh/unistd.h | |||
| @@ -295,8 +295,14 @@ | |||
| 295 | #define __NR_add_key 285 | 295 | #define __NR_add_key 285 |
| 296 | #define __NR_request_key 286 | 296 | #define __NR_request_key 286 |
| 297 | #define __NR_keyctl 287 | 297 | #define __NR_keyctl 287 |
| 298 | #define __NR_ioprio_set 288 | ||
| 299 | #define __NR_ioprio_get 289 | ||
| 300 | #define __NR_inotify_init 290 | ||
| 301 | #define __NR_inotify_add_watch 291 | ||
| 302 | #define __NR_inotify_rm_watch 292 | ||
| 298 | 303 | ||
| 299 | #define NR_syscalls 288 | 304 | |
| 305 | #define NR_syscalls 293 | ||
| 300 | 306 | ||
| 301 | /* user-visible error numbers are in the range -1 - -124: see <asm-sh/errno.h> */ | 307 | /* user-visible error numbers are in the range -1 - -124: see <asm-sh/errno.h> */ |
| 302 | 308 | ||