diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:32:04 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:32:04 +0100 |
| commit | fa32475ad56d339178c9be12678906f2b39e3b47 (patch) | |
| tree | 939dc4bddcefe7eabaa3ecb2b63cabe01bf4d093 /arch/arm/mach-actions/Makefile | |
| parent | ff4f0321c533f4cde844829854735da64a4a327f (diff) | |
| parent | 6c2eb3e76fb84e2eb46d484f71fab469c0d9532c (diff) | |
Merge tag 'actions-arm-soc-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/soc
Pull "Actions Semi Arm SoC for v4.15" from Andreas Färber:
This cleans up the S500 SMP code.
* tag 'actions-arm-soc-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions:
ARM: owl: smp: Drop owl_secondary_boot()
ARM: owl: smp: Use __pa_symbol()
Diffstat (limited to 'arch/arm/mach-actions/Makefile')
| -rw-r--r-- | arch/arm/mach-actions/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-actions/Makefile b/arch/arm/mach-actions/Makefile index c0f116241da7..13831037d8cd 100644 --- a/arch/arm/mach-actions/Makefile +++ b/arch/arm/mach-actions/Makefile @@ -1,3 +1 @@ -obj-${CONFIG_SMP} += platsmp.o headsmp.o - -AFLAGS_headsmp.o := -Wa,-march=armv7-a +obj-${CONFIG_SMP} += platsmp.o |