summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-08-11 14:43:05 +0200
committerOlof Johansson <olof@lixom.net>2015-08-11 14:43:09 +0200
commitfc293f5f2a2d94b889666c3dc3faa09f6b55e3e3 (patch)
tree1b9954e3afc1f025a707032195125dacfc3030be /arch/arm/mach-shmobile
parentc00def71efd919e8ae835a25f4f4c80a4b2d36d3 (diff)
downloadop-kernel-dev-fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3.zip
op-kernel-dev-fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3.tar.gz
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/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 29687a7..9fd0fac 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)
OpenPOWER on IntegriCloud