From 4640841246daddf109f94cda08be45055a827501 Mon Sep 17 00:00:00 2001 From: Wartan Hachaturow Date: Sat, 9 Feb 2008 03:03:10 +0300 Subject: [PATCH] [PPC] Fix merge leftover Fix a leftover from a merge. Signed-off-by: Wartan Hachaturow --- include/asm-powerpc/unistd.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h index 0dad75c..c1cb4c5 100644 --- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h @@ -325,8 +325,6 @@ #define __NR_set_robust_list 300 #define __NR_syscalls 301 -======= -#define __NR_syscalls 286 #ifdef __KERNEL__ #define __NR__exit __NR_exit -- 1.5.3.8.GIT