summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2011-10-25 17:54:03 -0500
committerKumar Gala <galak@kernel.crashing.org>2011-11-03 13:12:28 -0500
commit7d0d3ad5e3cfbf96aa4a2d6ee26a20c98a29d4a1 (patch)
tree3c100e3094fb917baa59827821469f0cd7bef612 /arch
parent44f16fcf2fba79cffb268d8f3c1f744efefa5dc9 (diff)
downloadlinux-7d0d3ad5e3cfbf96aa4a2d6ee26a20c98a29d4a1.tar.bz2
powerpc/fsl_booke: Fix comment in head_fsl_booke.S
Fix typo in comments introduced by: commit 6dece0eb69b2a28e18d104bc5d707f1cb673f5e0 Author: Scott Wood <scottwood@freescale.com> Date: Mon Jul 25 11:29:33 2011 +0000 powerpc/32: Pass device tree address as u64 to machine_init Signed-off-by: Matthew McClintock <msm@freescale.com> cc: Scott Wood <scottwood@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/head_fsl_booke.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index e1c699f3b7a7..9f5d210ddf3f 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -80,8 +80,8 @@ _ENTRY(_start);
slw r18,r18,r17 /* r18 = page size */
addi r18,r18,-1
and r19,r3,r18 /* r19 = page offset */
- andc r31,r20,r18 /* r3 = page base */
- or r31,r31,r19 /* r3 = devtree phys addr */
+ andc r31,r20,r18 /* r31 = page base */
+ or r31,r31,r19 /* r31 = devtree phys addr */
mfspr r30,SPRN_MAS7
li r25,0 /* phys kernel start (low) */