summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-03-03 15:41:15 +0100
committerOlof Johansson <olof@lixom.net>2015-04-02 01:24:32 +0200
commita90c13819b17fed8ccbaaeb15433a86c87709df0 (patch)
tree564524bee475177403627004f5aba45cfcc72b6a /arch/arm/configs
parentMerge tag 'mvebu-defconfig-4.1' of git://git.infradead.org/linux-mvebu into n... (diff)
downloadlinux-a90c13819b17fed8ccbaaeb15433a86c87709df0.tar.xz
linux-a90c13819b17fed8ccbaaeb15433a86c87709df0.zip
ARM: configs: enable Marvell Armada 39x in multi_v7_defconfig
Following the introduction of the Marvell Armada 39x support, let's enable this support by default in multi_v7_defconfig. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: <arm@kernel.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/multi_v7_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index b7e6b6fba5e0..487813fa23c3 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -16,6 +16,7 @@ CONFIG_ARCH_MVEBU=y
CONFIG_MACH_ARMADA_370=y
CONFIG_MACH_ARMADA_375=y
CONFIG_MACH_ARMADA_38X=y
+CONFIG_MACH_ARMADA_39X=y
CONFIG_MACH_ARMADA_XP=y
CONFIG_MACH_DOVE=y
CONFIG_ARCH_BCM=y