diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 09:02:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 09:02:07 -0700 |
commit | 9ca686626c012935b3b8219815e9027facc6fe6e (patch) | |
tree | 632364c2feb6b4c08d83d3014e771dee55f1e4c1 /include/asm-powerpc | |
parent | e57a5059846e55d82b86d96dde40e988598601b3 (diff) | |
parent | 70524490ee2ea1bbf6cee6c106597b3ac25a3fc2 (diff) |
Merge branch 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] splice: add support for sys_tee()
[PATCH] splice: pass offset around for ->splice_read() and ->splice_write()
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h index 536ba087305..c612f1a6277 100644 --- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h @@ -302,8 +302,9 @@ #define __NR_ppoll 281 #define __NR_unshare 282 #define __NR_splice 283 +#define __NR_tee 284 -#define __NR_syscalls 284 +#define __NR_syscalls 285 #ifdef __KERNEL__ #define __NR__exit __NR_exit |