diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 20:09:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 20:09:10 -0400 |
| commit | 340d10e47238daeb5e5eb27df25b4e7ec71f6571 (patch) | |
| tree | 75f826c087b3a69dda2da1498e3750802ef9adb7 /include | |
| parent | e0aa8afd97536a9d94f82a07b4c4b3f05aef6f82 (diff) | |
| parent | 48b0e5487fcdcb3421bda67666277348b2bd2661 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/unistd.h | 6 | ||||
| -rw-r--r-- | include/asm-sparc64/unistd.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index aee17d7e2e44..58dba518239e 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
| @@ -167,12 +167,12 @@ | |||
| 167 | #define __NR_pciconfig_read 148 /* ENOSYS under SunOS */ | 167 | #define __NR_pciconfig_read 148 /* ENOSYS under SunOS */ |
| 168 | #define __NR_pciconfig_write 149 /* ENOSYS under SunOS */ | 168 | #define __NR_pciconfig_write 149 /* ENOSYS under SunOS */ |
| 169 | #define __NR_getsockname 150 /* Common */ | 169 | #define __NR_getsockname 150 /* Common */ |
| 170 | /* #define __NR_getmsg 151 SunOS Specific */ | 170 | #define __NR_inotify_init 151 /* Linux specific */ |
| 171 | /* #define __NR_putmsg 152 SunOS Specific */ | 171 | #define __NR_inotify_add_watch 152 /* Linux specific */ |
| 172 | #define __NR_poll 153 /* Common */ | 172 | #define __NR_poll 153 /* Common */ |
| 173 | #define __NR_getdents64 154 /* Linux specific */ | 173 | #define __NR_getdents64 154 /* Linux specific */ |
| 174 | #define __NR_fcntl64 155 /* Linux sparc32 Specific */ | 174 | #define __NR_fcntl64 155 /* Linux sparc32 Specific */ |
| 175 | /* #define __NR_getdirentires 156 SunOS Specific */ | 175 | #define __NR_inotify_rm_watch 156 /* Linux specific */ |
| 176 | #define __NR_statfs 157 /* Common */ | 176 | #define __NR_statfs 157 /* Common */ |
| 177 | #define __NR_fstatfs 158 /* Common */ | 177 | #define __NR_fstatfs 158 /* Common */ |
| 178 | #define __NR_umount 159 /* Common */ | 178 | #define __NR_umount 159 /* Common */ |
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index f59144c6b76a..51ec2879b881 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h | |||
| @@ -167,12 +167,12 @@ | |||
| 167 | #define __NR_pciconfig_read 148 /* ENOSYS under SunOS */ | 167 | #define __NR_pciconfig_read 148 /* ENOSYS under SunOS */ |
| 168 | #define __NR_pciconfig_write 149 /* ENOSYS under SunOS */ | 168 | #define __NR_pciconfig_write 149 /* ENOSYS under SunOS */ |
| 169 | #define __NR_getsockname 150 /* Common */ | 169 | #define __NR_getsockname 150 /* Common */ |
| 170 | /* #define __NR_getmsg 151 SunOS Specific */ | 170 | #define __NR_inotify_init 151 /* Linux specific */ |
| 171 | /* #define __NR_putmsg 152 SunOS Specific */ | 171 | #define __NR_inotify_add_watch 152 /* Linux specific */ |
| 172 | #define __NR_poll 153 /* Common */ | 172 | #define __NR_poll 153 /* Common */ |
| 173 | #define __NR_getdents64 154 /* Linux specific */ | 173 | #define __NR_getdents64 154 /* Linux specific */ |
| 174 | /* #define __NR_fcntl64 155 Linux sparc32 Specific */ | 174 | /* #define __NR_fcntl64 155 Linux sparc32 Specific */ |
| 175 | /* #define __NR_getdirentries 156 SunOS Specific */ | 175 | #define __NR_inotify_rm_watch 156 /* Linux specific */ |
| 176 | #define __NR_statfs 157 /* Common */ | 176 | #define __NR_statfs 157 /* Common */ |
| 177 | #define __NR_fstatfs 158 /* Common */ | 177 | #define __NR_fstatfs 158 /* Common */ |
| 178 | #define __NR_umount 159 /* Common */ | 178 | #define __NR_umount 159 /* Common */ |