From ea3e4a2b3945f62457fa377c2bd0f49c32192194 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Mon, 13 Jul 2015 15:15:23 +0900 Subject: [PATCH] ARM: shmobile: Remove Marzen from shmobile_defconfig Kill of the defconfig bits now when the marzen-reference board code is gone. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 89bf31ccfbfa..0bdeb4925be4 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -21,7 +21,6 @@ CONFIG_ARCH_R8A7791=y CONFIG_ARCH_R8A7793=y CONFIG_ARCH_R8A7794=y CONFIG_ARCH_SH73A0=y -CONFIG_MACH_MARZEN=y CONFIG_CPU_BPREDICT_DISABLE=y CONFIG_PL310_ERRATA_588369=y CONFIG_ARM_ERRATA_754322=y -- 2.39.5