From: Arnd Bergmann Date: Tue, 27 Mar 2018 13:29:06 +0000 (+0200) Subject: Merge tag 'stratix10_defconfig_for_v4.17' of ssh://gitolite.kernel.org/pub/scm/linux... X-Git-Tag: v4.19~1282^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99600b165f7c68f329610ec1184e43fb1a67ad9a;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'stratix10_defconfig_for_v4.17' of ssh://gitolite./linux/kernel/git/dinguyen/linux into next/soc Pull "ARM64: stratix10: defconfig updates for 4.17" from Dinh Nguyen: -enables STMMAC_ETH controller that is present on Stratix10 * tag 'stratix10_defconfig_for_v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: arm64: defconfig: enable stmmac ethernet to defconfig Signed-off-by: Arnd Bergmann --- 99600b165f7c68f329610ec1184e43fb1a67ad9a diff --cc arch/arm64/configs/defconfig index 1d3b406,a3ea32e..5e4ff17 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -220,8 -209,12 +220,13 @@@ CONFIG_QCOM_EMAC= CONFIG_RAVB=y CONFIG_SMC91X=y CONFIG_SMSC911X=y -CONFIG_STMMAC_ETH=y +CONFIG_SNI_NETSEC=y +CONFIG_STMMAC_ETH=m + CONFIG_DWMAC_IPQ806X=m + CONFIG_DWMAC_MESON=m + CONFIG_DWMAC_ROCKCHIP=m + CONFIG_DWMAC_SUNXI=m + CONFIG_DWMAC_SUN8I=m CONFIG_MDIO_BUS_MUX_MMIOREG=y CONFIG_AT803X_PHY=m CONFIG_MARVELL_PHY=m