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

Commit f7f58ae0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-cleanups' 



Andrew Lunn says:

====================
DSA cleanup and fixes

The RFC patchset for re-architecturing DSA probing contains a few
standalone patches, either clean up or fixes. This pulls them out for
submission.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dc91d7ef 5bcbe0f3

arch/arm/configs/multi_v5_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 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_MV88E6123=y

CONFIG_NET_DSA_MV88E6171=y

CONFIG_NET_DSA_MV88E6352=y

CONFIG_MV643XX_ETH=y

arch/arm/configs/mvebu_v5_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 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_MV88E6123=y

CONFIG_NET_DSA_MV88E6171=y

CONFIG_NET_DSA_MV88E6352=y

CONFIG_MV643XX_ETH=y

arch/arm/configs/orion5x_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ CONFIG_SATA_MV=y 
CONFIG_NETDEVICES=y

CONFIG_MII=y

CONFIG_NET_DSA_MV88E6131=y

CONFIG_NET_DSA_MV88E6123_61_65=y

CONFIG_NET_DSA_MV88E6123=y

CONFIG_MV643XX_ETH=y

CONFIG_MARVELL_PHY=y

# CONFIG_INPUT_MOUSEDEV is not set

arch/tile/configs/tilegx_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ CONFIG_TUN=y 
CONFIG_VETH=m

CONFIG_NET_DSA_MV88E6060=y

CONFIG_NET_DSA_MV88E6131=y

CONFIG_NET_DSA_MV88E6123_61_65=y

CONFIG_NET_DSA_MV88E6123=y

CONFIG_SKY2=y

CONFIG_PTP_1588_CLOCK_TILEGX=y

# CONFIG_WLAN is not set

arch/tile/configs/tilepro_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ CONFIG_TUN=y 
CONFIG_VETH=m

CONFIG_NET_DSA_MV88E6060=y

CONFIG_NET_DSA_MV88E6131=y

CONFIG_NET_DSA_MV88E6123_61_65=y

CONFIG_NET_DSA_MV88E6123=y

# CONFIG_NET_VENDOR_3COM is not set

CONFIG_E1000E=y

# CONFIG_WLAN is not set