summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 19:03:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 19:03:49 -0800
commit4ba152596de23038e5bca413d23c3fe6fa92ff45 (patch)
tree39d6823f12cd1f9d760146294128c093b962ffb3 /arch
parent3a43aaa31790c36b69ebf8a6396f37fade86b531 (diff)
parent27a338a69ed9a8a672cd620f5fd7fa450209313c (diff)
downloadop-kernel-dev-4ba152596de23038e5bca413d23c3fe6fa92ff45.zip
op-kernel-dev-4ba152596de23038e5bca413d23c3fe6fa92ff45.tar.gz
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')
-rw-r--r--arch/ia64/include/asm/unistd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 9c72e36..10a8f21 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -311,7 +311,7 @@
#define __NR_preadv 1319
#define __NR_pwritev 1320
#define __NR_rt_tgsigqueueinfo 1321
-#define __NR_rt_recvmmsg 1322
+#define __NR_recvmmsg 1322
#ifdef __KERNEL__
OpenPOWER on IntegriCloud