diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:16:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:16:27 -0800 |
| commit | 970114a1dacf5f1f47aae9ad75c0abca42d8499c (patch) | |
| tree | 4373412a410d5d61226dfb6a845b74e714a7c6e3 /arch/sh/include/asm/unistd_32.h | |
| parent | def20529227a5c0938c374d11781bd0dbd5edee4 (diff) | |
| parent | 79f211b8e17205aae0304c58518fbc58506e52e3 (diff) | |
| download | talos-op-linux-970114a1dacf5f1f47aae9ad75c0abca42d8499c.tar.gz talos-op-linux-970114a1dacf5f1f47aae9ad75c0abca42d8499c.zip | |
Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh64: wire up sys_accept4.
sh: unwire sys_recvmmsg.
sh: ms7724: Correct sh-eth EEPROM polling timeout.
Diffstat (limited to 'arch/sh/include/asm/unistd_32.h')
| -rw-r--r-- | arch/sh/include/asm/unistd_32.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h index f18c4f9baf27..365744b05269 100644 --- a/arch/sh/include/asm/unistd_32.h +++ b/arch/sh/include/asm/unistd_32.h @@ -345,12 +345,13 @@ #define __NR_pwritev 334 #define __NR_rt_tgsigqueueinfo 335 #define __NR_perf_event_open 336 -#define __NR_recvmmsg 337 -#define NR_syscalls 338 +#define NR_syscalls 337 #ifdef __KERNEL__ +#define __IGNORE_recvmmsg + #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT |
