Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / entry.S

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index e0be92a6abb01ad1e5bc12a467e5b379c3047662..7e3382b06d56c22d990466655fce778a46579bc5 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1542,7 +1542,7 @@ sys_call_table:
        data8 sys_mkdir                         // 1055
        data8 sys_rmdir
        data8 sys_dup
-       data8 sys_pipe
+       data8 sys_ia64_pipe
        data8 sys_times
        data8 ia64_brk                          // 1060
        data8 sys_setgid