diff options
| author | Linaro CI <ci_notify@linaro.org> | 2018-05-07 18:40:20 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2018-05-07 18:40:20 +0000 |
| commit | 43f52708a9d5eb69d675ec73e1c67502c3985de3 (patch) | |
| tree | 8c77cc26f5bc2cd587633d02fd90748991140703 | |
| parent | 25dee0aa2e6f6788f35b1e8038147260e2afed49 (diff) | |
| parent | ad606095a6aa5eda4efebe559ab514e9ae3176a6 (diff) | |
Merge remote-tracking branch 'msm8998-defconfig/qcomlt/msm8998-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20180508-043512-43f52708a9d5
# Conflicts:
# arch/arm64/configs/defconfig
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 9bf86ae21b00..45e8d7121e43 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -344,6 +344,7 @@ CONFIG_PINCTRL_MAX77620=y CONFIG_PINCTRL_MSM8916=y CONFIG_PINCTRL_MSM8994=y CONFIG_PINCTRL_MSM8996=y +CONFIG_PINCTRL_MSM8998=y CONFIG_PINCTRL_SDM845=y CONFIG_PINCTRL_QDF2XXX=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y @@ -583,6 +584,7 @@ CONFIG_IPQ_GCC_8074=y CONFIG_MSM_CLK_RPMH=y CONFIG_MSM_GCC_8916=y CONFIG_MSM_GCC_8994=y +CONFIG_MSM_GCC_8998=y CONFIG_MSM_MMCC_8996=y CONFIG_HWSPINLOCK=y CONFIG_SDM_GCC_845=y |