From 7f558a124022630e177f08bbdd0673c3301f7e84 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 9 Nov 2013 13:33:48 +0100 Subject: ARM: shmobile: genmai: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY The ARCH_SHMOBILE configuration option has been renamed to ARCH_SHMOBILE_LEGACY. Update the defconfig accordingly. Signed-off-by: Laurent Pinchart Acked-by: Magnus Damm [ horms+renesas@verge.net.au: Removed non-genmai changes which have been squashed into "ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY". ] Signed-off-by: Simon Horman --- arch/arm/configs/genmai_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/configs/genmai_defconfig') diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig index 69b1531a4c80..aa0b704f48af 100644 --- a/arch/arm/configs/genmai_defconfig +++ b/arch/arm/configs/genmai_defconfig @@ -12,7 +12,7 @@ CONFIG_SLAB=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y +CONFIG_ARCH_SHMOBILE_LEGACY=y CONFIG_ARCH_R7S72100=y CONFIG_MACH_GENMAI=y # CONFIG_SH_TIMER_CMT is not set -- cgit v1.2.3