diff options
| author | Linaro CI <ci_notify@linaro.org> | 2018-05-02 04:52:41 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2018-05-02 04:52:41 +0000 |
| commit | a3aa1619c5b1ea3dfad385dfe8a8b8a88bd7a1a3 (patch) | |
| tree | f5364ed79688abc5a66017b9795a23c5f6a73320 | |
| parent | 6189a5f1428099b1657d7012a2099a459d5db3e3 (diff) | |
| parent | ad606095a6aa5eda4efebe559ab514e9ae3176a6 (diff) | |
Merge remote-tracking branch 'msm8998-defconfig/qcomlt/msm8998-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20180503-043352-a3aa1619c5b1
# 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 |