diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-11 14:43:05 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-11 14:43:09 +0200 |
| commit | fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3 (patch) | |
| tree | 1b9954e3afc1f025a707032195125dacfc3030be /arch/arm/mach-shmobile | |
| parent | ARM: ux500: simplify secondary CPU boot (diff) | |
| download | linux-fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3.tar.xz linux-fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3.zip | |
ARM: shmobile: Fix mismerges
Turns out I fumbled a couple of the merge resolutions for marzen board removal.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 29687a7a0a94..9fd0fac92dd1 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -51,6 +51,7 @@ obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o ifndef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o +endif # Framework support obj-$(CONFIG_SMP) += $(smp-y) |