Commit ee937329 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'socfpga_defconfig_updates_for_v4.12' of...

Merge tag 'socfpga_defconfig_updates_for_v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/defconfig

SoCFPGA defconfig updates for v4.12
- enables TSE(Triple-Speed-Ethernet) support

* tag 'socfpga_defconfig_updates_for_v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: updates for socfpga_defconfig
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d08c78fa b685b264
...@@ -71,6 +71,7 @@ CONFIG_SCSI=y ...@@ -71,6 +71,7 @@ CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
# CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SCSI_LOWLEVEL is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_ALTERA_TSE=m
CONFIG_E1000E=m CONFIG_E1000E=m
CONFIG_IGB=m CONFIG_IGB=m
CONFIG_IXGBE=m CONFIG_IXGBE=m
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment