Merge branch 'master' into tk71

[mv-sheeva.git] / arch / arm / kernel / relocate_kernel.S

diff --git a/arch/arm/kernel/relocate_kernel.S b/arch/arm/kernel/relocate_kernel.S
index fd26f8d65151a949e6ecff394f0146258882b9d6..9cf4cbf8f95b8ca9eef1baf1d8f49054999304f8 100644 (file)
--- a/arch/arm/kernel/relocate_kernel.S
+++ b/arch/arm/kernel/relocate_kernel.S
@@ -59,6 +59,8 @@ relocate_new_kernel:
        ldr r2,kexec_boot_atags
        mov pc,lr
 
+       .align
+
        .globl kexec_start_address
 kexec_start_address:
        .long   0x0