Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus

[~andy/linux] / arch / sparc / mm / tsunami.S

diff --git a/arch/sparc/mm/tsunami.S b/arch/sparc/mm/tsunami.S
index db0d6de33a87cdbff398ed8f0a90835a6811c226..4e55e8f76648a27da7ff666b0fae21590e182651 100644 (file)
--- a/arch/sparc/mm/tsunami.S
+++ b/arch/sparc/mm/tsunami.S
@@ -93,7 +93,6 @@ tsunami_flush_tlb_page_out:
        ldd     [src + offset + 0x00], t2; \
        std     t2, [dst + offset + 0x00];
 
-       .globl  tsunami_copy_1page
 tsunami_copy_1page:
 /* NOTE: This routine has to be shorter than 70insns --jj */
        or      %g0, (PAGE_SIZE >> 8), %g1