Merge branch 'fix/asoc' into for-linus

[mv-sheeva.git] / arch / sparc / kernel / entry.S

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index faf9ccd9ef5dfc32f41da7c3b9b1d74f564669bc..f41ecc5ac0b41f1d72375fe8e9efb1105412f89c 100644 (file)
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1088,8 +1088,8 @@ sunos_execv:
         ld     [%sp + STACKFRAME_SZ + PT_I0], %o0
 
        .align  4
-       .globl  sys_pipe
-sys_pipe:
+       .globl  sys_sparc_pipe
+sys_sparc_pipe:
        mov     %o7, %l5
        add     %sp, STACKFRAME_SZ, %o0         ! pt_regs *regs arg
        call    sparc_pipe