Merge branch 'for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux...

[karo-tx-linux.git] / arch / powerpc / boot / util.S

diff --git a/arch/powerpc/boot/util.S b/arch/powerpc/boot/util.S
index 6636b1d7821b6e5d5bcd8126674a8f3d8499601f..243b8497d58b847a2877523c45df04f2f1326b32 100644 (file)
--- a/arch/powerpc/boot/util.S
+++ b/arch/powerpc/boot/util.S
@@ -45,7 +45,7 @@ udelay:
        mfspr   r4,SPRN_PVR
        srwi    r4,r4,16
        cmpwi   0,r4,1          /* 601 ? */
-       bne     .udelay_not_601
+       bne     .Ludelay_not_601
 00:    li      r0,86   /* Instructions / microsecond? */
        mtctr   r0
 10:    addi    r0,r0,0 /* NOP */
@@ -54,7 +54,7 @@ udelay:
        bne     00b
        blr
 
-.udelay_not_601:
+.Ludelay_not_601:
        mulli   r4,r3,1000      /* nanoseconds */
        /*  Change r4 to be the number of ticks using:
         *      (nanoseconds + (timebase_period_ns - 1 )) / timebase_period_ns