diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 (patch) | |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 /include/asm-sh/unistd.h | |
| parent | 1b5cca3a88b7682d538d129c25f0e3092613a243 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
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 | ||