summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorjpinto <Joao.Pinto@synopsys.com>2017-01-12 09:56:18 +0000
committerDavid S. Miller <davem@davemloft.net>2017-01-15 22:00:59 -0500
commit1ecf9284c14614f9854dfa4c66f70d17c21182d1 (patch)
treec3d180ca339fdf7a439eb85f5a080cf5aa59a890 /arch
parentbb60b8b35a7350585dc4bc2847479cea47f139d4 (diff)
downloadlinux-stable-1ecf9284c14614f9854dfa4c66f70d17c21182d1.tar.gz
linux-stable-1ecf9284c14614f9854dfa4c66f70d17c21182d1.tar.bz2
linux-stable-1ecf9284c14614f9854dfa4c66f70d17c21182d1.zip
synopsys: remove dwc_eth_qos driver
This driver is no longer necessary since it was merged into stmmac. Acked-by: Lars Persson <larper@axis.com> Signed-off-by: Joao Pinto <jpinto@synopsys.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/multi_v7_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index b01a43851294..64f4419f14e8 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -253,7 +253,8 @@ CONFIG_R8169=y
CONFIG_SH_ETH=y
CONFIG_SMSC911X=y
CONFIG_STMMAC_ETH=y
-CONFIG_SYNOPSYS_DWC_ETH_QOS=y
+CONFIG_STMMAC_PLATFORM=y
+CONFIG_DWMAC_DWC_QOS_ETH=y
CONFIG_TI_CPSW=y
CONFIG_XILINX_EMACLITE=y
CONFIG_AT803X_PHY=y