diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
| commit | 912bc6ae3de99c7bada4577d4341ace4ee59b5be (patch) | |
| tree | 28fd1a4bb9e4b05aa833285b46df169f12c0e24d /arch/frv/include/asm/unistd.h | |
| parent | d37dc42ab6f040b8f0f2962ab219c5b2accf748d (diff) | |
| parent | 091438dd5668396328a3419abcbc6591159eb8d1 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/frv/include/asm/unistd.h')
| -rw-r--r-- | arch/frv/include/asm/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h index edcfaf5f0414..96d78d5d2c41 100644 --- a/arch/frv/include/asm/unistd.h +++ b/arch/frv/include/asm/unistd.h | |||
| @@ -339,10 +339,12 @@ | |||
| 339 | #define __NR_dup3 330 | 339 | #define __NR_dup3 330 |
| 340 | #define __NR_pipe2 331 | 340 | #define __NR_pipe2 331 |
| 341 | #define __NR_inotify_init1 332 | 341 | #define __NR_inotify_init1 332 |
| 342 | #define __NR_preadv 333 | ||
| 343 | #define __NR_pwritev 334 | ||
| 342 | 344 | ||
| 343 | #ifdef __KERNEL__ | 345 | #ifdef __KERNEL__ |
| 344 | 346 | ||
| 345 | #define NR_syscalls 333 | 347 | #define NR_syscalls 335 |
| 346 | 348 | ||
| 347 | #define __ARCH_WANT_IPC_PARSE_VERSION | 349 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 348 | /* #define __ARCH_WANT_OLD_READDIR */ | 350 | /* #define __ARCH_WANT_OLD_READDIR */ |