diff options
| author | Olof Johansson <olof@lixom.net> | 2017-04-19 05:31:55 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 05:31:55 -0700 |
| commit | ee93732978a98fd6c1c86268fa2f0a0a7f4c74e5 (patch) | |
| tree | ce14de197098003b458aea2895289aa56455ea93 /arch/arm/configs | |
| parent | d08c78fa10d238bc5359814653bfc9eb10ce8132 (diff) | |
| parent | b685b264636b4f3f3eaa0b62fee674a45f2b1679 (diff) | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/socfpga_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index 030264c98eec..2620ce790db0 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -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 |