diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /include/asm-frv | |
| parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-frv')
| -rw-r--r-- | include/asm-frv/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h index 7306c71a8926..cd84f1771e34 100644 --- a/include/asm-frv/unistd.h +++ b/include/asm-frv/unistd.h | |||
| @@ -330,10 +330,11 @@ | |||
| 330 | #define __NR_signalfd 321 | 330 | #define __NR_signalfd 321 |
| 331 | #define __NR_timerfd 322 | 331 | #define __NR_timerfd 322 |
| 332 | #define __NR_eventfd 323 | 332 | #define __NR_eventfd 323 |
| 333 | #define __NR_fallocate 324 | ||
| 333 | 334 | ||
| 334 | #ifdef __KERNEL__ | 335 | #ifdef __KERNEL__ |
| 335 | 336 | ||
| 336 | #define NR_syscalls 324 | 337 | #define NR_syscalls 325 |
| 337 | 338 | ||
| 338 | #define __ARCH_WANT_IPC_PARSE_VERSION | 339 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 339 | /* #define __ARCH_WANT_OLD_READDIR */ | 340 | /* #define __ARCH_WANT_OLD_READDIR */ |