Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / arch / arm / mach-omap2 / omap-smc.S

diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S
index fd2bcd91f4a14c874bd8b833bd91a7e5ef0d8c8c..d4832845a4e8b7faba9cc4af09927dcab6dc61d4 100644 (file)
--- a/arch/arm/mach-omap2/omap-smc.S
+++ b/arch/arm/mach-omap2/omap-smc.S
@@ -18,18 +18,18 @@
  * the monitor API number. It uses few CPU registers
  * internally and hence they need be backed up including
  * link register "lr".
- * Function signature : void omap_smc1(u32 fn, u32 arg)
+ * Function signature : void _omap_smc1(u32 fn, u32 arg)
  */
        .arch armv7-a
        .arch_extension sec
-ENTRY(omap_smc1)
+ENTRY(_omap_smc1)
        stmfd   sp!, {r2-r12, lr}
        mov     r12, r0
        mov     r0, r1
        dsb
        smc     #0
        ldmfd   sp!, {r2-r12, pc}
-ENDPROC(omap_smc1)
+ENDPROC(_omap_smc1)
 
 /**
  * u32 omap_smc2(u32 id, u32 falg, u32 pargs)