aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-03-27 09:29:06 -0400
committerArnd Bergmann <arnd@arndb.de>2018-03-27 09:29:06 -0400
commit99600b165f7c68f329610ec1184e43fb1a67ad9a (patch)
tree34980e3882a6c2238166fb86570e3d021231878d
parent34dacef1c3299cd3588301e9515c11ae90147698 (diff)
parent83d6e27e6856edf30845df8708b3b1e226ba5c7f (diff)
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>
-rw-r--r--arch/arm64/configs/defconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 1d3b40615efb..5e4ff17a3ad8 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -222,6 +222,11 @@ CONFIG_SMC91X=y
222CONFIG_SMSC911X=y 222CONFIG_SMSC911X=y
223CONFIG_SNI_NETSEC=y 223CONFIG_SNI_NETSEC=y
224CONFIG_STMMAC_ETH=m 224CONFIG_STMMAC_ETH=m
225CONFIG_DWMAC_IPQ806X=m
226CONFIG_DWMAC_MESON=m
227CONFIG_DWMAC_ROCKCHIP=m
228CONFIG_DWMAC_SUNXI=m
229CONFIG_DWMAC_SUN8I=m
225CONFIG_MDIO_BUS_MUX_MMIOREG=y 230CONFIG_MDIO_BUS_MUX_MMIOREG=y
226CONFIG_AT803X_PHY=m 231CONFIG_AT803X_PHY=m
227CONFIG_MARVELL_PHY=m 232CONFIG_MARVELL_PHY=m