diff options
author | Olof Johansson <olof@lixom.net> | 2012-12-14 21:16:07 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-12-14 21:17:01 (GMT) |
commit | c91321e8ff338a88a9272dcd938f085955cd5846 (patch) | |
tree | 3285fcdc17b2275555ad28747364eae6c4aa2e11 /arch/arm/mach-socfpga/Makefile | |
parent | 1f1ba836455b94494aaee9381ed9197ade2f770f (diff) | |
parent | 9560f840f301868b4b4b175e81afa96dc57611ac (diff) | |
download | linux-fsl-qoriq-c91321e8ff338a88a9272dcd938f085955cd5846.tar.xz |
ARM: arm-soc: Merge branch 'next/smp' into next/soc2
Merging in the smp-on-socfpga branch into soc2 since the topics are similar
and it's a short branch in the first place.
* next/smp:
ARM: socfpga: mark secondary_trampoline as cpuinit
socfpga: map uart into virtual address space so that early_printk() works
ARM: socfpga: fix build break for allyesconfig
ARM: socfpga: Enable SMP for socfpga
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-socfpga/Makefile')
-rw-r--r-- | arch/arm/mach-socfpga/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile index 4fb9324..6dd7a93 100644 --- a/arch/arm/mach-socfpga/Makefile +++ b/arch/arm/mach-socfpga/Makefile @@ -3,3 +3,4 @@ # obj-y := socfpga.o +obj-$(CONFIG_SMP) += headsmp.o platsmp.o |