Commit 99600b16 authored Mar 27, 2018 by Arnd Bergmann

Merge tag 'stratix10_defconfig_for_v4.17' of...

Merge tag 'stratix10_defconfig_for_v4.17' of ssh://gitolite.kernel.org/pub/scm/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 <arnd@arndb.de>

parents 34dacef1 83d6e27e

arch/arm64/configs/defconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,11 @@ CONFIG_SMC91X=y
		CONFIG_SMSC911X=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