Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1bfa919 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 13a7a6ac f224b572

arch/arm/configs/mvebu_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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