diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2022-02-15 12:20:37 -0600 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2022-02-15 12:23:26 -0600 |
| commit | bfcc08a078af8728568b1ecfaf53395b5d6aae5f (patch) | |
| tree | 15dc476707a7770c7870d08024f423874543e69d | |
| parent | cd7ce3e18afa7bef1ce371706416918de1aa3bc5 (diff) | |
| parent | 156f91f1c49a5f2ccae8e4b2d882ca3a28e3f26f (diff) | |
Merge branch 'arm64-defconfig-for-5.17' into arm64-defconfig-for-5.18qcom-arm64-defconfig-for-5.18
The Qualcomm ARM64 defconfig pull request for v5.17 was lost in
transmission, so merge it into the branch destined for v5.18.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index bbe40f0fd620..bcbdc8869fd6 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -530,6 +530,7 @@ CONFIG_PINCTRL_SDM845=y CONFIG_PINCTRL_SM8150=y CONFIG_PINCTRL_SM8250=y CONFIG_PINCTRL_SM8350=y +CONFIG_PINCTRL_SM8450=y CONFIG_PINCTRL_LPASS_LPI=m CONFIG_GPIO_ALTERA=m CONFIG_GPIO_DAVINCI=y @@ -1021,6 +1022,7 @@ CONFIG_SDM_DISPCC_845=y CONFIG_SM_GCC_8150=y CONFIG_SM_GCC_8250=y CONFIG_SM_GCC_8350=y +CONFIG_SM_GCC_8450=y CONFIG_SM_GPUCC_8150=y CONFIG_SM_GPUCC_8250=y CONFIG_SM_DISPCC_8250=y @@ -1206,6 +1208,7 @@ CONFIG_INTERCONNECT_QCOM_SDM845=y CONFIG_INTERCONNECT_QCOM_SM8150=m CONFIG_INTERCONNECT_QCOM_SM8250=m CONFIG_INTERCONNECT_QCOM_SM8350=m +CONFIG_INTERCONNECT_QCOM_SM8450=m CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS_POSIX_ACL=y |