diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-11 12:43:05 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-11 12:43:09 (GMT) |
| commit | fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3 (patch) | |
| tree | 1b9954e3afc1f025a707032195125dacfc3030be | |
| parent | c00def71efd919e8ae835a25f4f4c80a4b2d36d3 (diff) | |
| download | linux-fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3.tar.xz | |
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>
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index d10eea8..917aa31 100644 --- 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 --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) |