Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-sparc64 / unistd.h

diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index d0544b4f47b75d30744098f551f1374c745dadbb..597f6923a46eec7665cb887a0c2b7e9b51404f1c 100644 (file)
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -250,7 +250,7 @@
 #ifdef __KERNEL__
 #define __NR_time              231 /* Linux sparc32                               */
 #endif
-#define __NR_sys_splice         232 /* Linux Specific                              */
+#define __NR_splice             232 /* Linux Specific                              */
 #define __NR_stime              233 /* Linux Specific                              */
 #define __NR_statfs64           234 /* Linux Specific                              */
 #define __NR_fstatfs64          235 /* Linux Specific                              */
@@ -298,7 +298,7 @@
 #define __NR_mq_notify         277
 #define __NR_mq_getsetattr     278
 #define __NR_waitid            279
-/*#define __NR_sys_setaltroot  280 available (was setaltroot) */
+#define __NR_tee               280
 #define __NR_add_key           281
 #define __NR_request_key       282
 #define __NR_keyctl            283