From 5683fe5a93af21308f748291937caf8e62aeb0fc Mon Sep 17 00:00:00 2001 From: Chris Goldsworthy Date: Fri, 29 Apr 2022 15:39:54 -0700 Subject: [PATCH] arm64: defconfig: Restore the qcom_iommu_util module The qcom_iommu_util module had to be reverted in commit 5791009e998b ("Revert "arm64: defconfig: Compile in IOMMU util module"") due to an LTS merge conflict in commit d82e9dd3f46e ("Merge keystone/android-mainline-keystone-qcom-release.5.18-rc2 (2069378) into msm-pineapple"). Restore the compilation of the module accordingly. Change-Id: Ief7b5c44f172f1ba767039e983eb217fd765f676 Signed-off-by: Chris Goldsworthy --- arch/arm64/configs/vendor/pineapple_GKI.config | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/vendor/pineapple_GKI.config b/arch/arm64/configs/vendor/pineapple_GKI.config index b6cfb3632420..29cd53f82310 100644 --- a/arch/arm64/configs/vendor/pineapple_GKI.config +++ b/arch/arm64/configs/vendor/pineapple_GKI.config @@ -11,6 +11,7 @@ CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m CONFIG_PINCTRL_MSM=m CONFIG_PINCTRL_PINEAPPLE=m CONFIG_QCOM_COMMAND_DB=m +CONFIG_QCOM_IOMMU_UTIL=m CONFIG_QCOM_PDC=m CONFIG_QCOM_RPMH=m CONFIG_QCOM_SCM=m