diff options
author | David S. Miller <davem@davemloft.net> | 2017-05-25 12:01:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-25 12:01:22 -0400 |
commit | abc7a4ef843cf46a070374318fd239e2971c3b9b (patch) | |
tree | d31e6cbc1f046c70802723db9e5a7ea942e674f7 /drivers/net/ethernet/mellanox/mlx5/core/Kconfig | |
parent | tcp: fix TCP_SYNCNT flakes (diff) | |
parent | IB/mlx5: Bump driver version (diff) | |
download | linux-dev-abc7a4ef843cf46a070374318fd239e2971c3b9b.tar.xz linux-dev-abc7a4ef843cf46a070374318fd239e2971c3b9b.zip |
Merge tag 'mlx5-update-2017-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Saeed Mahameed says:
====================
mlx5-update-2017-05-23
First patch from Leon, came to remove the redundant usage of mlx5_vzalloc,
and directly use kvzalloc across all mlx5 drivers.
2nd patch from Noa, adds new device IDs into the supported devices list.
3rd and 4th patches from Ilan are adding the basic infrastructure and
support for Mellanox's mlx5 FPGA.
Last two patches from Tariq came to modify the outdated driver version
reported in ethtool and in mlx5_ib to more reflect the current driver state
and remove the redundant date string reported in the version.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/Kconfig')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index 27251a78075c..cf1ef48bfd8d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -11,6 +11,16 @@ config MLX5_CORE Core driver for low level functionality of the ConnectX-4 and Connect-IB cards by Mellanox Technologies. +config MLX5_FPGA + bool "Mellanox Technologies Innova support" + depends on MLX5_CORE + ---help--- + Build support for the Innova family of network cards by Mellanox + Technologies. Innova network cards are comprised of a ConnectX chip + and an FPGA chip on one board. If you select this option, the + mlx5_core driver will include the Innova FPGA core and allow building + sandbox-specific client drivers. + config MLX5_CORE_EN bool "Mellanox Technologies ConnectX-4 Ethernet support" depends on NETDEVICES && ETHERNET && INET && PCI && MLX5_CORE |