summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/unistd.h
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-05-12 16:48:52 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2006-05-12 16:48:52 +0200
commit7d63b54a65ce902f9aaa8efe8192aa3b983264d4 (patch)
tree250a77bebe92cbd6edac70a649866044295876db /include/asm-sparc/unistd.h
parent[GFS2] Readpages support (diff)
parentLinux v2.6.17-rc4 (diff)
downloadlinux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.tar.xz
linux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.zip
Merge branch 'master'
Diffstat (limited to 'include/asm-sparc/unistd.h')
-rw-r--r--include/asm-sparc/unistd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index 32a48f623e2b..f5611a721fbd 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/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 */