diff options
| author | Linaro CI <ci_notify@linaro.org> | 2019-06-10 12:56:14 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2019-06-10 12:56:14 +0000 |
| commit | e8139a5e8f6fd8f84bdd1e0fd783b15343183bd0 (patch) | |
| tree | f3e42755895392e3cbe2f3eaaf0d7c0ddbeb2fb0 | |
| parent | b51c2d823947328a94f6c412a05c07259a1578d7 (diff) | |
| parent | eab2e0619527d4929e17cfbcb6dca16f98683c18 (diff) | |
Merge remote-tracking branch 'sm8150-defconf/tracking-qcomlt-sm8150-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20190614-054941-v5.2-rc4-128-ge8139a5e8f6f
# Conflicts:
# arch/arm64/configs/defconfig
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 0219f165a80b..f2dfc90d0cac 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -689,6 +689,7 @@ CONFIG_MSM_MMCC_8996=y CONFIG_MSM_GCC_8998=y CONFIG_QCS_GCC_404=y CONFIG_SDM_GCC_845=y +CONFIG_SM_GCC_8150=y CONFIG_QCOM_HFPLL=y CONFIG_HWSPINLOCK=y CONFIG_SDM_GPUCC_845=y |