diff options
| author | Magnus Damm <damm+renesas@opensource.se> | 2015-07-13 15:15:12 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-07-28 09:27:15 +0900 |
| commit | 26f9e03fb1c8b8b5dd2f1ad34da775cc129df98a (patch) | |
| tree | 2ca7f1e4f5672393712b19b9026bf358a17e9b4b /arch/arm/mach-shmobile/Makefile | |
| parent | 44ade5edf90ccd38efa741240efb2586239c9751 (diff) | |
| download | linux-stable-26f9e03fb1c8b8b5dd2f1ad34da775cc129df98a.tar.gz linux-stable-26f9e03fb1c8b8b5dd2f1ad34da775cc129df98a.tar.bz2 linux-stable-26f9e03fb1c8b8b5dd2f1ad34da775cc129df98a.zip | |
ARM: shmobile: marzen-reference: Remove C board code
The generic r8a7779 machine vector is now feature-wise equivalent
to the Marzen-reference case, so simply remove the Marzen C board
code to fall over on the generic r8a7779 machine vector.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 89e463de4479..08b12b4d3f90 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -51,9 +51,7 @@ obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o # Board objects -ifdef CONFIG_ARCH_SHMOBILE_MULTI -obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o -else +ifndef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o obj-$(CONFIG_MACH_MARZEN) += board-marzen.o |