diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/mn10300/include/asm/unistd.h | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'arch/mn10300/include/asm/unistd.h')
| -rw-r--r-- | arch/mn10300/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h index 2a983931c11f..c05acb95c2a9 100644 --- a/arch/mn10300/include/asm/unistd.h +++ b/arch/mn10300/include/asm/unistd.h | |||
| @@ -348,10 +348,11 @@ | |||
| 348 | #define __NR_pwritev 335 | 348 | #define __NR_pwritev 335 |
| 349 | #define __NR_rt_tgsigqueueinfo 336 | 349 | #define __NR_rt_tgsigqueueinfo 336 |
| 350 | #define __NR_perf_event_open 337 | 350 | #define __NR_perf_event_open 337 |
| 351 | #define __NR_recvmmsg 338 | ||
| 351 | 352 | ||
| 352 | #ifdef __KERNEL__ | 353 | #ifdef __KERNEL__ |
| 353 | 354 | ||
| 354 | #define NR_syscalls 338 | 355 | #define NR_syscalls 339 |
| 355 | 356 | ||
| 356 | /* | 357 | /* |
| 357 | * specify the deprecated syscalls we want to support on this arch | 358 | * specify the deprecated syscalls we want to support on this arch |