Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+3 -2
+3 -2
drivers/crypto/intel/qat/qat_common/Makefile
··· 39 39 adf_sysfs_rl.o \ 40 40 qat_uclo.o \ 41 41 qat_hal.o \ 42 - qat_bl.o 42 + qat_bl.o \ 43 + qat_mig_dev.o 43 44 44 45 intel_qat-$(CONFIG_DEBUG_FS) += adf_transport_debug.o \ 45 46 adf_fw_counters.o \ ··· 57 56 intel_qat-$(CONFIG_PCI_IOV) += adf_sriov.o adf_vf_isr.o adf_pfvf_utils.o \ 58 57 adf_pfvf_pf_msg.o adf_pfvf_pf_proto.o \ 59 58 adf_pfvf_vf_msg.o adf_pfvf_vf_proto.o \ 60 - adf_gen2_pfvf.o adf_gen4_pfvf.o qat_mig_dev.o 59 + adf_gen2_pfvf.o adf_gen4_pfvf.o 61 60 62 61 intel_qat-$(CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION) += adf_heartbeat_inject.o