Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee937329 authored by Olof Johansson's avatar Olof Johansson
Browse files

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
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
# CONFIG_SCSI_LOWLEVEL is not set
CONFIG_NETDEVICES=y
CONFIG_ALTERA_TSE=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IXGBE=m