diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-01-08 13:28:00 -0800 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-08 13:28:00 -0800 |
commit | 833d22f2f922bbee6430e558417af060db6bbe9c (patch) | |
tree | 8d2d8824318d53d6d8e3b7bf5680f953a62c2f3b /drivers/net/ethernet/qlogic | |
parent | 58334e7537278793c86baa88b70c48b0d50b00ae (diff) | |
parent | 6279d812eab67a6df6b22fa495201db6f2305924 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in CAN on file rename.
Conflicts:
drivers/net/can/m_can/tcan4x5x-core.c
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r-- | drivers/net/ethernet/qlogic/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig index 4366c7a8de95..6b5ddb07ee83 100644 --- a/drivers/net/ethernet/qlogic/Kconfig +++ b/drivers/net/ethernet/qlogic/Kconfig @@ -78,6 +78,7 @@ config QED depends on PCI select ZLIB_INFLATE select CRC8 + select CRC32 select NET_DEVLINK help This enables the support for Marvell FastLinQ adapters family. |