[GIT PULL 2/2] arm64: stratix10: defconfig update for v4.17

[Arnd Bergmann]

On Fri, Mar 23, 2018 at 8:54 PM, Dinh Nguyen <dinguyen at kernel.org> wrote:

> ----------------------------------------------------------------
> ARM64: stratix10: defconfig updates for 4.17
> -enables STMMAC_ETH controller that is present on Stratix10

I got a conflict against an earlier patch that enabled CONFIG_STMMAC_ETH=m
and kept that version, as I see no need to have it built-in, see below for the
merge conflict resolution.

     Arnd

diff --cc arch/arm64/configs/defconfig
index 1d3b40615efb,a3ea32e4312f..5e4ff17a3ad8
--- 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