diff options
| author | Linaro CI <ci_notify@linaro.org> | 2018-05-18 15:32:14 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2018-05-18 15:32:14 +0000 |
| commit | e06044dfd638b80ff9b79935b0a9befe7c44d02f (patch) | |
| tree | 063b74c5e0f66ac2a6da94ca37fdff20c66ec927 | |
| parent | 8272ef99715c59d717d5a8e78a4e4664f84f5694 (diff) | |
| parent | ad606095a6aa5eda4efebe559ab514e9ae3176a6 (diff) | |
Merge remote-tracking branch 'msm8998-defconfig/qcomlt/msm8998-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20180520-230128-e06044dfd638
# 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 d7ad6bb09f2c..9cec1daa4a5c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -343,6 +343,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 @@ -582,6 +583,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 |