summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorNicolas Pitre <nico@fluxnic.net>2009-11-07 07:35:06 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-11-08 12:58:54 +0100
commit158bc5af3d49be49c33dc06ff90c4f754c7d4f1b (patch)
treec54fa97f41b290753d873137ea97b3a61fcfb5b5 /arch
parentARM: 5780/1: KS8695: Fix macro definition bug in regs-switch.c (diff)
downloadlinux-158bc5af3d49be49c33dc06ff90c4f754c7d4f1b.tar.xz
linux-158bc5af3d49be49c33dc06ff90c4f754c7d4f1b.zip
ARM: 5784/1: fix early boot machine ID mismatch error display
That code was refactored a long time ago, but one particular label didn't get adjusted properly which broke the listing of supported machines. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/head-common.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index 885a7214418d..b9505aa267c0 100644
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
@@ -97,7 +97,7 @@ __error_a:
bl printhex8
adr r0, str_a2
bl printascii
- adr r3, 3f
+ adr r3, 4f
ldmia r3, {r4, r5, r6} @ get machine desc list
sub r4, r3, r4 @ get offset between virt&phys
add r5, r5, r4 @ convert virt addresses to