Commit fc293f5f authored by Olof Johansson's avatar Olof Johansson

ARM: shmobile: Fix mismerges

Turns out I fumbled a couple of the merge resolutions for marzen board removal.
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent c00def71
......@@ -502,9 +502,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
s5pv210-torbreck.dtb
dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
r8a7778-bockw.dtb \
r8a7778-bockw-reference.dtb \
r8a7779-marzen.dtb \
sh73a0-kzm9g.dtb
r8a7778-bockw-reference.dtb
dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
emev2-kzm9d.dtb \
r7s72100-genmai.dtb \
......
......@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment