From df8ee58d73ae8590bc4c9ddbe19211e4485f9d17 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 1 Oct 2013 19:33:24 +0900 Subject: ARM: shmobile: Remove non-multiplatform KZM9D reference support Now when CCF is supported remove the legacy KZM9D reference Kconfig bits CONFIG_MACH_KZM9D_REFERENCE for the non-multiplatform case. Starting from this commit KZM9D board support is always enabled via CONFIG_MACH_KZM9D, and CONFIG_ARCH_MULTIPLATFORM is used to select between board-kzm9d.c and board-kzm9d-reference.c The file board-kzm9d-reference.c can no longer be used together with the legacy sh-clk clock framework, instead CCF is used. Signed-off-by: Magnus Damm Acked-by: Laurent Pinchart Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-shmobile/Makefile') diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index b11466d4d94..51db2bcafab 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -72,7 +72,6 @@ obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o -obj-$(CONFIG_MACH_KZM9D_REFERENCE) += board-kzm9d-reference.o obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o endif -- cgit v1.2.3-70-g09d2