diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 04:24:07 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 04:24:07 -0500 |
| commit | f862f904d357dc0d3612347a8dbabe6fae037fbb (patch) | |
| tree | d7f5c2d5f85fd9e1cfc36beae904dc4f9cca04a3 /arch/sh/include | |
| parent | 6f09e41d704fe0bc9157a5357480751d39361d01 (diff) | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Conflicts:
arch/sh/kernel/cpu/sh2a/clock-sh7201.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/unistd_32.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h index 903cd618eb74..d6741fca89a4 100644 --- a/arch/sh/include/asm/unistd_32.h +++ b/arch/sh/include/asm/unistd_32.h | |||
| @@ -368,8 +368,9 @@ | |||
| 368 | #define __NR_sendmsg 355 | 368 | #define __NR_sendmsg 355 |
| 369 | #define __NR_recvmsg 356 | 369 | #define __NR_recvmsg 356 |
| 370 | #define __NR_recvmmsg 357 | 370 | #define __NR_recvmmsg 357 |
| 371 | #define __NR_accept4 358 | ||
| 371 | 372 | ||
| 372 | #define NR_syscalls 358 | 373 | #define NR_syscalls 359 |
| 373 | 374 | ||
| 374 | #ifdef __KERNEL__ | 375 | #ifdef __KERNEL__ |
| 375 | 376 | ||