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

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

Merge tag 'mvebu-defconfig-3.19' of git://git.infradead.org/linux-mvebu into next/defconfig 

Pull "mvebu defconfig changes for v3.19" from Jason Cooper"

 - Add options for DLink DIR665
 - Add Armada 370 simple-card audio option
 - Add mv88E6171 switch driver option

* tag 'mvebu-defconfig-3.19' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: defconfig: Enable the mv88E6171 switch driver
  ARM: mvebu: update mvebu_v7_defconfig for Armada 370 audio
  ARM: config: Add DLINK DIR665 options to multi_v5_defconfig
  ARM: mvebu: Add DLINK DIR665 options to mvebu_v5_defconfig

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4fa0ff8c 64bbc2bf

arch/arm/configs/multi_v5_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -67,9 +67,11 @@ CONFIG_SATA_AHCI=y 
CONFIG_SATA_MV=y

CONFIG_NETDEVICES=y

CONFIG_NET_DSA_MV88E6123_61_65=y

CONFIG_NET_DSA_MV88E6171=y

CONFIG_MV643XX_ETH=y

CONFIG_R8169=y

CONFIG_MARVELL_PHY=y

CONFIG_MWL8K=m

CONFIG_LIBERTAS=y

CONFIG_LIBERTAS_SDIO=y

CONFIG_INPUT_EVDEV=y

arch/arm/configs/mvebu_v5_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -67,9 +67,11 @@ CONFIG_SATA_AHCI=y 
CONFIG_SATA_MV=y

CONFIG_NETDEVICES=y

CONFIG_NET_DSA_MV88E6123_61_65=y

CONFIG_NET_DSA_MV88E6171=y

CONFIG_MV643XX_ETH=y

CONFIG_R8169=y

CONFIG_MARVELL_PHY=y

CONFIG_MWL8K=m

CONFIG_LIBERTAS=y

CONFIG_LIBERTAS_SDIO=y

CONFIG_INPUT_EVDEV=y

arch/arm/configs/mvebu_v7_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -59,10 +59,12 @@ CONFIG_ATA=y 
CONFIG_AHCI_MVEBU=y

CONFIG_SATA_MV=y

CONFIG_NETDEVICES=y

CONFIG_NET_DSA_MV88E6171=y

CONFIG_MV643XX_ETH=y

CONFIG_MVNETA=y

CONFIG_MVPP2=y

CONFIG_MARVELL_PHY=y

CONFIG_FIXED_PHY=y

CONFIG_MWIFIEX=y

CONFIG_MWIFIEX_SDIO=y

CONFIG_INPUT_EVDEV=y
@@ -85,7 +87,9 @@ CONFIG_SOUND=y 
CONFIG_SND=y

CONFIG_SND_SOC=y

CONFIG_SND_KIRKWOOD_SOC=y

CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y

CONFIG_SND_SOC_CS42L51_I2C=y

CONFIG_SND_SOC_SPDIF=y

CONFIG_SND_SIMPLE_CARD=y

CONFIG_USB=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_MVEBU=y