Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / arch / sh / include / asm / unistd_32.h

diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h
index 2000709..903cd61 100644 (file)
--- a/arch/sh/include/asm/unistd_32.h
+++ b/arch/sh/include/asm/unistd_32.h
@@ -350,30 +350,29 @@
 #define __NR_prlimit64         339
 
 /* Non-multiplexed socket family */
-#define __NR_socket        340
-#define __NR_bind          341
-#define __NR_connect       342
-#define __NR_listen        343
-#define __NR_accept        344
-#define __NR_getsockname   345
-#define __NR_getpeername   346
-#define __NR_socketpair    347
-#define __NR_send          348
-#define __NR_sendto        349
-#define __NR_recv          350
-#define __NR_recvfrom      351
-#define __NR_shutdown      352
-#define __NR_setsockopt    353
-#define __NR_getsockopt    354
-#define __NR_sendmsg       355
-#define __NR_recvmsg       356
+#define __NR_socket            340
+#define __NR_bind              341
+#define __NR_connect           342
+#define __NR_listen            343
+#define __NR_accept            344
+#define __NR_getsockname       345
+#define __NR_getpeername       346
+#define __NR_socketpair                347
+#define __NR_send              348
+#define __NR_sendto            349
+#define __NR_recv              350
+#define __NR_recvfrom          351
+#define __NR_shutdown          352
+#define __NR_setsockopt                353
+#define __NR_getsockopt                354
+#define __NR_sendmsg           355
+#define __NR_recvmsg           356
+#define __NR_recvmmsg          357
 
-#define NR_syscalls 357
+#define NR_syscalls 358
 
 #ifdef __KERNEL__
 
-#define __IGNORE_recvmmsg
-
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_OLD_STAT