aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2020-10-20 08:19:24 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2020-10-20 08:19:24 -0700
commit2b1cfa4acf8cb2a2ca0b6e6c0bbf8a79c946e192 (patch)
tree4257336c3911cd88ac909909f33fe95476c4a0af
parentc69885283305253b3d034dfe8274250caaf07afc (diff)
parent86ce69a96d1acfd570d614f9daecae2c78517400 (diff)
Merge "defconfig: Enable CONFIG_LEGACY_ENERGY_MODEL_DT for sdm660" into kernel.lnx.4.19.r10-relLA.UM.9.2.1.r1-04600-sdm660.0
-rw-r--r--arch/arm64/configs/vendor/sdm660-perf_defconfig1
-rw-r--r--arch/arm64/configs/vendor/sdm660_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/vendor/sdm660-perf_defconfig b/arch/arm64/configs/vendor/sdm660-perf_defconfig
index 11fb0f5bcead..b9f530ebe1d7 100644
--- a/arch/arm64/configs/vendor/sdm660-perf_defconfig
+++ b/arch/arm64/configs/vendor/sdm660-perf_defconfig
@@ -666,6 +666,7 @@ CONFIG_NVMEM_SPMI_SDAM=y
CONFIG_SLIMBUS_MSM_NGD=y
CONFIG_SENSORS_SSC=y
CONFIG_QCOM_KGSL=y
+CONFIG_LEGACY_ENERGY_MODEL_DT=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_ENCRYPTION=y
diff --git a/arch/arm64/configs/vendor/sdm660_defconfig b/arch/arm64/configs/vendor/sdm660_defconfig
index dcf30da05ed6..089e0b123b81 100644
--- a/arch/arm64/configs/vendor/sdm660_defconfig
+++ b/arch/arm64/configs/vendor/sdm660_defconfig
@@ -707,6 +707,7 @@ CONFIG_NVMEM_SPMI_SDAM=y
CONFIG_SLIMBUS_MSM_NGD=y
CONFIG_SENSORS_SSC=y
CONFIG_QCOM_KGSL=y
+CONFIG_LEGACY_ENERGY_MODEL_DT=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_ENCRYPTION=y