github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 11:37:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

modules.list.msm.pineapple: Re-add qcom_iommu_util.ko

Browse Source 
The qcom_iommu_util module had to be reverted in commit 1d99777147
("Revert "modules.list.msm.pineapple: Add qcom_iommu_util.ko"") due to
an LTS merge conflict in commit d82e9dd3f4 ("Merge
keystone/android-mainline-keystone-qcom-release.5.18-rc2 (2069378)
into msm-pineapple"). Restore the loading of the module accordingly.

Change-Id: I2a86cc8f5fd8bc6ce41d6b5793704e573277fe80
Signed-off-by: Chris Goldsworthy <quic_cgoldswo@quicinc.com>
This commit is contained in:
Chris Goldsworthy 2022-05-05 16:47:07 -07:00
parent 5683fe5a93
commit 1a66e8cf59
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules.list.msm.pineapple
View File

@ -1,6 +1,7 @@
cmd-db.ko
qcom_rpmh.ko
qcom-pdc.ko
qcom_iommu_util.ko
arm_smmu.ko
qcom-scm.ko
pinctrl-msm.ko