Merge branch 'for-33' of git://repo.or.cz/linux-kbuild

[linux-2.6-block.git] / arch / sparc / lib / memset.S

diff --git a/arch/sparc/lib/memset.S b/arch/sparc/lib/memset.S
index 1c37ea892debaf853c94152a2eefbec7b5d798a2..99c017be8719609bbc6e99ada83610e2d38763a1 100644 (file)
--- a/arch/sparc/lib/memset.S
+++ b/arch/sparc/lib/memset.S
@@ -60,11 +60,10 @@
         .globl  __bzero_begin
 __bzero_begin:
 
-       .globl  __bzero, __memset, 
+       .globl  __bzero
        .globl  memset
        .globl  __memset_start, __memset_end
 __memset_start:
-__memset:
 memset:
        and     %o1, 0xff, %g3
        sll     %g3, 8, %g2