diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-01-24 10:56:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-24 10:56:59 -0500 |
| commit | 969ade4086b9f25ac345637b549074ed341bf729 (patch) | |
| tree | 2da504879fe5907464ec7278345ea831c4150fcc /drivers/net/ethernet/chelsio/Kconfig | |
| parent | Merge branch 'net-smc-socket-closing-improvements' (diff) | |
| parent | cxgb4: properly initialize variables (diff) | |
| download | linux-dev-969ade4086b9f25ac345637b549074ed341bf729.tar.xz linux-dev-969ade4086b9f25ac345637b549074ed341bf729.zip | |
Merge branch 'cxgb4-fix-build-error'
Rahul Lakkireddy says:
====================
cxgb4: fix build error
Patch 1 fixes build error with compiling cudbg_zlib.c when
CONFIG_ZLIB_DEFLATE macro is not defined.
Patch 2 fixes following sparse warning:
"Using plain integer as NULL pointer"
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/chelsio/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig index 5713e83be08c..e2cdfa75673f 100644 --- a/drivers/net/ethernet/chelsio/Kconfig +++ b/drivers/net/ethernet/chelsio/Kconfig @@ -69,6 +69,7 @@ config CHELSIO_T4 depends on PCI && (IPV6 || IPV6=n) select FW_LOADER select MDIO + select ZLIB_DEFLATE ---help--- This driver supports Chelsio T4, T5 & T6 based gigabit, 10Gb Ethernet adapter and T5/T6 based 40Gb and T6 based 25Gb, 50Gb and 100Gb |