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>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d10eea8..917aa31 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge