diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
| commit | edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch) | |
| tree | f375d28043dd4457428a841167dc93d760ba9a46 /include/asm-sparc/unistd.h | |
| parent | cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 (diff) | |
| parent | e17df688f7064dae1417ce425dd1e4b71d24d63b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc/unistd.h')
| -rw-r--r-- | include/asm-sparc/unistd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 2a911aa4cae9..32a48f623e2b 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
| @@ -248,7 +248,7 @@ | |||
| 248 | #define __NR_setfsgid 229 /* Linux Specific */ | 248 | #define __NR_setfsgid 229 /* Linux Specific */ |
| 249 | #define __NR__newselect 230 /* Linux Specific */ | 249 | #define __NR__newselect 230 /* Linux Specific */ |
| 250 | #define __NR_time 231 /* Linux Specific */ | 250 | #define __NR_time 231 /* Linux Specific */ |
| 251 | #define __NR_sys_splice 232 /* Linux Specific */ | 251 | #define __NR_splice 232 /* Linux Specific */ |
| 252 | #define __NR_stime 233 /* Linux Specific */ | 252 | #define __NR_stime 233 /* Linux Specific */ |
| 253 | #define __NR_statfs64 234 /* Linux Specific */ | 253 | #define __NR_statfs64 234 /* Linux Specific */ |
| 254 | #define __NR_fstatfs64 235 /* Linux Specific */ | 254 | #define __NR_fstatfs64 235 /* Linux Specific */ |
| @@ -271,7 +271,7 @@ | |||
| 271 | #define __NR_getsid 252 | 271 | #define __NR_getsid 252 |
| 272 | #define __NR_fdatasync 253 | 272 | #define __NR_fdatasync 253 |
| 273 | #define __NR_nfsservctl 254 | 273 | #define __NR_nfsservctl 254 |
| 274 | #define __NR_sys_sync_file_range 255 | 274 | #define __NR_sync_file_range 255 |
| 275 | #define __NR_clock_settime 256 | 275 | #define __NR_clock_settime 256 |
| 276 | #define __NR_clock_gettime 257 | 276 | #define __NR_clock_gettime 257 |
| 277 | #define __NR_clock_getres 258 | 277 | #define __NR_clock_getres 258 |