Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[sfrench/cifs-2.6.git] / arch / alpha / lib / memset.S

diff --git a/arch/alpha/lib/memset.S b/arch/alpha/lib/memset.S
index 89a26f5e89de3db904cbfabb1ff735464d6ca3cb..f824969e9e77a61eb2750cf82c41c8da3d0e2557 100644 (file)
--- a/arch/alpha/lib/memset.S
+++ b/arch/alpha/lib/memset.S
@@ -20,7 +20,7 @@
        .globl memset
        .globl __memset
        .globl ___memset
-       .globl __memsetw
+       .globl __memset16
        .globl __constant_c_memset
 
        .ent ___memset
@@ -110,8 +110,8 @@ EXPORT_SYMBOL(___memset)
 EXPORT_SYMBOL(__constant_c_memset)
 
        .align 5
-       .ent __memsetw
-__memsetw:
+       .ent __memset16
+__memset16:
        .prologue 0
 
        inswl $17,0,$1          /* E0 */
@@ -123,8 +123,8 @@ __memsetw:
        or $1,$4,$17            /* E0 */
        br __constant_c_memset  /* .. E1 */
 
-       .end __memsetw
-EXPORT_SYMBOL(__memsetw)
+       .end __memset16
+EXPORT_SYMBOL(__memset16)
 
 memset = ___memset
 __memset = ___memset