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>

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>
Olof Johansson
1 parent c00def71ef
Showing 2 changed files with 2 additions and 3 deletions Side-by-side Diff
arch/arm/boot/dts/Makefile
arch/arm/mach-shmobile/Makefile
@@ -502,9 +502,7 @@
 	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 @@
 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)
...	...	@@ -502,9 +502,7 @@
502	502	s5pv210-torbreck.dtb
503	503	dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
504	504	r8a7778-bockw.dtb \
505		- r8a7778-bockw-reference.dtb \
506		- r8a7779-marzen.dtb \
507		- sh73a0-kzm9g.dtb
	505	+ r8a7778-bockw-reference.dtb
508	506	dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
509	507	emev2-kzm9d.dtb \
510	508	r7s72100-genmai.dtb \
...	...	@@ -51,6 +51,7 @@
51	51	ifndef CONFIG_ARCH_SHMOBILE_MULTI
52	52	obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
53	53	obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
	54	+endif
54	55
55	56	# Framework support
56	57	obj-$(CONFIG_SMP) += $(smp-y)