diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:03:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:03:49 -0500 |
| commit | 4ba152596de23038e5bca413d23c3fe6fa92ff45 (patch) | |
| tree | 39d6823f12cd1f9d760146294128c093b962ffb3 /arch/ia64 | |
| parent | 3a43aaa31790c36b69ebf8a6396f37fade86b531 (diff) | |
| parent | 27a338a69ed9a8a672cd620f5fd7fa450209313c (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix cut/paste detritus from unistd.h
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 9c72e36c5281..10a8f21ca9e3 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h | |||
| @@ -311,7 +311,7 @@ | |||
| 311 | #define __NR_preadv 1319 | 311 | #define __NR_preadv 1319 |
| 312 | #define __NR_pwritev 1320 | 312 | #define __NR_pwritev 1320 |
| 313 | #define __NR_rt_tgsigqueueinfo 1321 | 313 | #define __NR_rt_tgsigqueueinfo 1321 |
| 314 | #define __NR_rt_recvmmsg 1322 | 314 | #define __NR_recvmmsg 1322 |
| 315 | 315 | ||
| 316 | #ifdef __KERNEL__ | 316 | #ifdef __KERNEL__ |
| 317 | 317 | ||