diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-17 07:46:06 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-17 07:46:06 +0100 |
| commit | 8b0f6d12de91345190f234edba781b2fd03257b6 (patch) | |
| tree | 4b6015433a0ffe5fc7ff9115014e3da580581f4b /arch/arm/plat-versatile | |
| parent | Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm i... (diff) | |
| parent | ARM: make BSYM macro assembly only (diff) | |
| download | linux-8b0f6d12de91345190f234edba781b2fd03257b6.tar.xz linux-8b0f6d12de91345190f234edba781b2fd03257b6.zip | |
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
* 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux:
ARM: make BSYM macro assembly only
ARM: highbank: remove incorrect BSYM usage
ARM: imx: remove incorrect BSYM usage
ARM: exynos: remove incorrect BSYM usage
ARM: ux500: add missing ENDPROC to headsmp.S
ARM: msm: Add missing ENDPROC to headsmp.S
ARM: versatile: Add missing ENDPROC to headsmp.S
Diffstat (limited to 'arch/arm/plat-versatile')
| -rw-r--r-- | arch/arm/plat-versatile/headsmp.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/plat-versatile/headsmp.S index d397a1fb2f54..dd703ef09b8d 100644 --- a/arch/arm/plat-versatile/headsmp.S +++ b/arch/arm/plat-versatile/headsmp.S @@ -38,3 +38,4 @@ pen: ldr r7, [r6] .align 1: .long . .long pen_release +ENDPROC(versatile_secondary_startup) |