Merge branch 'fix/hda' into for-linus

[pandora-kernel.git] / arch / sparc / lib / bzero.S

diff --git a/arch/sparc/lib/bzero.S b/arch/sparc/lib/bzero.S
index b655729..615f401 100644 (file)
--- a/arch/sparc/lib/bzero.S
+++ b/arch/sparc/lib/bzero.S
@@ -6,10 +6,6 @@
 
        .text
 
-       .globl  __memset
-       .type   __memset, #function
-__memset:              /* %o0=buf, %o1=pat, %o2=len */
-
        .globl  memset
        .type   memset, #function
 memset:                        /* %o0=buf, %o1=pat, %o2=len */
@@ -83,7 +79,6 @@ __bzero_done:
        retl
         mov            %o3, %o0
        .size           __bzero, .-__bzero
-       .size           __memset, .-__memset
        .size           memset, .-memset
 
 #define EX_ST(x,y)             \