Merge tag 'stratix10_defconfig_for_v4.17' of ssh://gitolite.kernel.org/pub/scm/linux...

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 <arnd@arndb.de>

diff --cc arch/arm64/configs/defconfig
index 1d3b40615efbb2cddae9f1531d94c638bd668848,a3ea32e4312fdda7c4f58205dbee9fe10f2ebaf0..5e4ff17a3ad8677cb9127bee5dedb0d6e62d23f6
--- 1/arch/arm64/configs/defconfig
--- 2/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