aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-10 17:52:31 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-10 17:52:31 -0500
commitd6c662d4f13801fe5ce24e8bbdea321e2572d7e5 (patch)
tree14e1736ed8ca9a1f846147355e3beebbeba3f78f /include
parent21b4da78c941f292f6daf87abb562d6285216e51 (diff)
parent00adbf62bd16f6527e046b422349a54d783a3d86 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/unistd.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
index a40cdff21a88..35556993f066 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -300,8 +300,9 @@
300#define __NR_spu_create 279 300#define __NR_spu_create 279
301#define __NR_pselect6 280 301#define __NR_pselect6 280
302#define __NR_ppoll 281 302#define __NR_ppoll 281
303#define __NR_unshare 282
303 304
304#define __NR_syscalls 282 305#define __NR_syscalls 283
305 306
306#ifdef __KERNEL__ 307#ifdef __KERNEL__
307#define __NR__exit __NR_exit 308#define __NR__exit __NR_exit