diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:10:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:10:38 -0500 |
| commit | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch) | |
| tree | 7ad6e825427a15c5ec0fc15540abc0429d7f4bce /arch/sh/include/asm/unistd_64.h | |
| parent | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (diff) | |
| parent | eed18b5fa4d297c681b00144e8c6942dd35d39a7 (diff) | |
Merge branches 'clks' and 'pnx' into devel
Diffstat (limited to 'arch/sh/include/asm/unistd_64.h')
| -rw-r--r-- | arch/sh/include/asm/unistd_64.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h index 3e7645d11130..25de158aac3a 100644 --- a/arch/sh/include/asm/unistd_64.h +++ b/arch/sh/include/asm/unistd_64.h | |||
| @@ -386,10 +386,11 @@ | |||
| 386 | #define __NR_rt_tgsigqueueinfo 363 | 386 | #define __NR_rt_tgsigqueueinfo 363 |
| 387 | #define __NR_perf_event_open 364 | 387 | #define __NR_perf_event_open 364 |
| 388 | #define __NR_recvmmsg 365 | 388 | #define __NR_recvmmsg 365 |
| 389 | #define __NR_accept4 366 | ||
| 389 | 390 | ||
| 390 | #ifdef __KERNEL__ | 391 | #ifdef __KERNEL__ |
| 391 | 392 | ||
| 392 | #define NR_syscalls 366 | 393 | #define NR_syscalls 367 |
| 393 | 394 | ||
| 394 | #define __ARCH_WANT_IPC_PARSE_VERSION | 395 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 395 | #define __ARCH_WANT_OLD_READDIR | 396 | #define __ARCH_WANT_OLD_READDIR |