diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index c29967115a1d..33d1eb03791c 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -184,6 +184,8 @@ CONFIG_PM_WAKELOCKS=y
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_QCOM_KGSL=m
 CONFIG_QCOM_QFPROM=m
+CONFIG_DEVFREQ_GOV_QCOM_GPUBW_MON=m
+CONFIG_DEVFREQ_GOV_QCOM_ADRENO_TZ=m
 CONFIG_INTERCONNECT_TEST=m
 CONFIG_SCSI_UFS_CRYPTO_QTI=m
 CONFIG_QTI_CRYPTO_COMMON=m
diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 07ffcecc9b9e..c751575ed5d5 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -147,8 +147,6 @@ CONFIG_I3C_MASTER_MSM_GENI=y
 CONFIG_SLIMBUS_MSM_NGD=y
 CONFIG_QCOM_KGSL=y
 CONFIG_QCOM_QFPROM=y
-CONFIG_DEVFREQ_GOV_QCOM_GPUBW_MON=y
-CONFIG_DEVFREQ_GOV_QCOM_ADRENO_TZ=y
 CONFIG_ARM_QCOM_CPUFREQ_HW=y
 CONFIG_NETFILTER_XT_TARGET_TEE=y
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=y