diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 23:17:42 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 23:17:42 +0100 |
| commit | edb9666260928159eb532c180027b5d2e2361675 (patch) | |
| tree | 9e77fdb977d4a2eff73e4444b864d40c0ff56087 /arch/arm/configs | |
| parent | 4fa0ff8c5b3e1300648b910c73a65b66068616d4 (diff) | |
| parent | 64bbc2bf639cd7891d6d9589ad665f1b30ee1b4a (diff) | |
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v5_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/mvebu_v5_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/mvebu_v7_defconfig | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index 018bef9fa7e8..9d56781a8f80 100644 --- a/arch/arm/configs/multi_v5_defconfig +++ b/arch/arm/configs/multi_v5_defconfig @@ -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 diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig index 22058e18dfaa..824de499237b 100644 --- a/arch/arm/configs/mvebu_v5_defconfig +++ b/arch/arm/configs/mvebu_v5_defconfig @@ -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 diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index ed0a0d1be0f3..9ca7e7822288 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -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 |