diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /include/asm-avr32/unistd.h | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-avr32/unistd.h')
| -rw-r--r-- | include/asm-avr32/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h index a50e5004550c..56ed1f9d348a 100644 --- a/include/asm-avr32/unistd.h +++ b/include/asm-avr32/unistd.h | |||
| @@ -280,9 +280,10 @@ | |||
| 280 | #define __NR_sync_file_range 262 | 280 | #define __NR_sync_file_range 262 |
| 281 | #define __NR_tee 263 | 281 | #define __NR_tee 263 |
| 282 | #define __NR_vmsplice 264 | 282 | #define __NR_vmsplice 264 |
| 283 | #define __NR_epoll_pwait 265 | ||
| 283 | 284 | ||
| 284 | #ifdef __KERNEL__ | 285 | #ifdef __KERNEL__ |
| 285 | #define NR_syscalls 265 | 286 | #define NR_syscalls 266 |
| 286 | 287 | ||
| 287 | 288 | ||
| 288 | #define __ARCH_WANT_IPC_PARSE_VERSION | 289 | #define __ARCH_WANT_IPC_PARSE_VERSION |