diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 23:09:05 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 23:09:05 +0100 |
| commit | b1bfa919f023f064015b183943e9c0548bfe7224 (patch) | |
| tree | effa80ad22e17b1061cde99a105eac67bd8c1666 /arch/arm/configs | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
| parent | f224b572dcc86017d793c047c92c8479f5a6ae14 (diff) | |
| download | linux-stable-b1bfa919f023f064015b183943e9c0548bfe7224.tar.gz linux-stable-b1bfa919f023f064015b183943e9c0548bfe7224.tar.bz2 linux-stable-b1bfa919f023f064015b183943e9c0548bfe7224.zip | |
Merge tag 'mvebu-defconfig-4.1' of git://git.infradead.org/linux-mvebu into next/defconfig
Pull "mvebu defconfig changes for v4.1 (part #1)" from Gregory CLEMENT:
- add the new Armada 39x SoC in mvebu_v7_defconfig
* tag 'mvebu-defconfig-4.1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: enable Armada 39x in mvebu_v7_defconfig
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mvebu_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index 73673e95f23c..bb262f0880fd 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -12,6 +12,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_PCI=y |