summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/multi_v5_defconfig
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2015-12-02 00:33:29 +0100
committerGregory CLEMENT <gregory.clement@free-electrons.com>2015-12-08 10:54:57 +0100
commita6cbc340d1e15ddcfebc60845bef743f1338e8cf (patch)
tree67aaa34622c0ea24a838e827cc800a5af8d6ba16 /arch/arm/configs/multi_v5_defconfig
parentARM: config: Regenerate multi_v5_defconfig (diff)
downloadlinux-a6cbc340d1e15ddcfebc60845bef743f1338e8cf.tar.xz
linux-a6cbc340d1e15ddcfebc60845bef743f1338e8cf.zip
ARM: config: Reenable DSA in multi_v5_defconfig
DSA now depends on switchdev. Enable it, and re-enable DSA and its drivers, which were removed when multi_v5_defconfig was regenerated. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm/configs/multi_v5_defconfig')
-rw-r--r--arch/arm/configs/multi_v5_defconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index f98d4b8b54c5..920db77916b1 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -37,6 +37,8 @@ CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IPV6 is not set
+CONFIG_NET_DSA=y
+CONFIG_NET_SWITCHDEV=y
CONFIG_NET_PKTGEN=m
CONFIG_CFG80211=y
CONFIG_MAC80211=y
@@ -64,6 +66,11 @@ CONFIG_ATA=y
CONFIG_SATA_AHCI=y
CONFIG_SATA_MV=y
CONFIG_NETDEVICES=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6171=y
+CONFIG_NET_DSA_MV88E6352=y
CONFIG_MV643XX_ETH=y
CONFIG_R8169=y
CONFIG_MARVELL_PHY=y