summaryrefslogtreecommitdiff
path: root/arch/arm/configs/shmobile_defconfig
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2015-07-13 15:15:23 +0900
committerSimon Horman <horms+renesas@verge.net.au>2015-09-14 10:12:58 +0900
commitea3e4a2b3945f62457fa377c2bd0f49c32192194 (patch)
treef570567f1b3da4dfc525fbf088d657166318c9a2 /arch/arm/configs/shmobile_defconfig
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
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 <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/configs/shmobile_defconfig')
-rw-r--r--arch/arm/configs/shmobile_defconfig1
1 files changed, 0 insertions, 1 deletions
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