diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-29 01:42:26 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-29 01:42:26 +0100 |
commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
tree | 032f067d3af458527d903a7653885404ed82431e /include/asm-powerpc/unistd.h | |
parent | acc429a517bd11fdcac9bea97d082d26231beb92 (diff) | |
parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
download | linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.tar.gz linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.tar.bz2 linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-powerpc/unistd.h')
-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 d471549e1b81..ef932f1cddc3 100644 --- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h @@ -303,8 +303,9 @@ #define __NR_unshare 282 #define __NR_splice 283 #define __NR_tee 284 +#define __NR_vmsplice 285 -#define __NR_syscalls 285 +#define __NR_syscalls 286 #ifdef __KERNEL__ #define __NR__exit __NR_exit |