diff options
author | Paul Mackerras <paulus@samba.org> | 2006-05-05 15:45:48 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-05-05 15:45:48 +1000 |
commit | f18fc729cd2d67b76e24206ee3567c1f6983c358 (patch) | |
tree | 9dbf177222d94213d9dd82d67de6d905e1a2b278 /include/asm-sparc64/unistd.h | |
parent | 5a43ee65620d628ba04deecf241b63b2410b97f2 (diff) | |
parent | d98550e334715b2d9e45f8f0f4e1608720108640 (diff) | |
download | talos-op-linux-f18fc729cd2d67b76e24206ee3567c1f6983c358.tar.gz talos-op-linux-f18fc729cd2d67b76e24206ee3567c1f6983c358.zip |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-sparc64/unistd.h')
-rw-r--r-- | include/asm-sparc64/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index ca80e8aca128..68705748bec0 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h @@ -41,7 +41,7 @@ #define __NR_capset 22 /* Linux Specific */ #define __NR_setuid 23 /* Implemented via setreuid in SunOS */ #define __NR_getuid 24 /* Common */ -/* #define __NR_time alias 25 ENOSYS under SunOS */ +#define __NR_vmsplice 25 /* ENOSYS under SunOS */ #define __NR_ptrace 26 /* Common */ #define __NR_alarm 27 /* Implemented via setitimer in SunOS */ #define __NR_sigaltstack 28 /* Common */ |