diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2024-06-27 17:43:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2024-06-27 17:43:15 -0700 |
| commit | 5bbd9b249880dba032bffa002dd9cd12cd5af09c (patch) | |
| tree | 474fc91979dd30c272f7acd1ff5ae4a5492cb95c /drivers/crypto | |
| parent | Merge tag 'drm-fixes-2024-06-28' of https://gitlab.freedesktop.org/drm/kernel (diff) | |
| parent | crypto: qat - fix linking errors when PCI_IOV is disabled (diff) | |
| download | linux-5bbd9b249880dba032bffa002dd9cd12cd5af09c.tar.gz linux-5bbd9b249880dba032bffa002dd9cd12cd5af09c.tar.bz2 linux-5bbd9b249880dba032bffa002dd9cd12cd5af09c.zip | |
Merge tag 'v6.10-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pyll crypto fix from Herbert Xu:
"Fix a build failure in qat"
* tag 'v6.10-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: qat - fix linking errors when PCI_IOV is disabled
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/intel/qat/qat_common/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/crypto/intel/qat/qat_common/Makefile b/drivers/crypto/intel/qat/qat_common/Makefile index 6f9266edc9f1..eac73cbfdd38 100644 --- a/drivers/crypto/intel/qat/qat_common/Makefile +++ b/drivers/crypto/intel/qat/qat_common/Makefile @@ -39,7 +39,8 @@ intel_qat-objs := adf_cfg.o \ adf_sysfs_rl.o \ qat_uclo.o \ qat_hal.o \ - qat_bl.o + qat_bl.o \ + qat_mig_dev.o intel_qat-$(CONFIG_DEBUG_FS) += adf_transport_debug.o \ adf_fw_counters.o \ @@ -56,6 +57,6 @@ intel_qat-$(CONFIG_DEBUG_FS) += adf_transport_debug.o \ intel_qat-$(CONFIG_PCI_IOV) += adf_sriov.o adf_vf_isr.o adf_pfvf_utils.o \ adf_pfvf_pf_msg.o adf_pfvf_pf_proto.o \ adf_pfvf_vf_msg.o adf_pfvf_vf_proto.o \ - adf_gen2_pfvf.o adf_gen4_pfvf.o qat_mig_dev.o + adf_gen2_pfvf.o adf_gen4_pfvf.o intel_qat-$(CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION) += adf_heartbeat_inject.o |