diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
| commit | 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 (patch) | |
| tree | d2cebc7039954851998d592123899f5627def7a9 /arch/arm/kernel/relocate_kernel.S | |
| parent | 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
Merge branch 'topic/workq-update' into topic/asoc
Conflicts:
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c
Diffstat (limited to 'arch/arm/kernel/relocate_kernel.S')
| -rw-r--r-- | arch/arm/kernel/relocate_kernel.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/relocate_kernel.S b/arch/arm/kernel/relocate_kernel.S index fd26f8d6515..9cf4cbf8f95 100644 --- a/arch/arm/kernel/relocate_kernel.S +++ b/arch/arm/kernel/relocate_kernel.S | |||
| @@ -59,6 +59,8 @@ relocate_new_kernel: | |||
| 59 | ldr r2,kexec_boot_atags | 59 | ldr r2,kexec_boot_atags |
| 60 | mov pc,lr | 60 | mov pc,lr |
| 61 | 61 | ||
| 62 | .align | ||
| 63 | |||
| 62 | .globl kexec_start_address | 64 | .globl kexec_start_address |
| 63 | kexec_start_address: | 65 | kexec_start_address: |
| 64 | .long 0x0 | 66 | .long 0x0 |