diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-01-04 14:34:46 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-01-04 14:34:46 +0000 |
commit | 6de92920a717ea2b7b45bb3d651b8bb951eab185 (patch) | |
tree | 92778efc5a0c31a4a26c1ab826a56be5a12cde45 /arch/arm/plat-versatile/headsmp.S | |
parent | 97b6f89f7269b746b68e7985c16d2354c688d29a (diff) | |
parent | 07a496de4c7eb0b1e80ab53f9d6465ea55ac1bd7 (diff) |
Merge commit 'smp-hotplug^{/omap2}' into for-linusfor-4.21
Diffstat (limited to 'arch/arm/plat-versatile/headsmp.S')
-rw-r--r-- | arch/arm/plat-versatile/headsmp.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/plat-versatile/headsmp.S index 40f27e52de75..e99396dfa6f3 100644 --- a/arch/arm/plat-versatile/headsmp.S +++ b/arch/arm/plat-versatile/headsmp.S @@ -37,5 +37,5 @@ pen: ldr r7, [r6] .align 1: .long . - .long pen_release + .long versatile_cpu_release ENDPROC(versatile_secondary_startup) |