aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Armstrong <[email protected]>2023-03-24 10:37:54 +0100
committerBjorn Andersson <[email protected]>2023-04-04 20:22:41 -0700
commit7b4c00e9cc36e24e60d9907e6c3161791b11695c (patch)
tree7003de236b96329cb43b33ba69b5b4161b51c913
parent4ffd0b0019560a52b46b9ebd8127be3fdc157f16 (diff)
arm64: defconfig: remove duplicate TYPEC_UCSI & QCOM_PMIC_GLINK
Both configs were already applied by 2 separate changes, fix this to avoid: arch/arm64/configs/defconfig:989:warning: override: reassigning to symbol TYPEC_UCSI arch/arm64/configs/defconfig:1232:warning: override: reassigning to symbol QCOM_PMIC_GLINK Fixes: 4ffd0b001956 ("arm64: defconfig: add PMIC GLINK modules") Signed-off-by: Neil Armstrong <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/20230324-topic-sm8450-upstream-defconfig-fixup-v1-1-2d75cc9b3c3d@linaro.org
-rw-r--r--arch/arm64/configs/defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 2d9325a2163d..5c191a3058b5 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -274,8 +274,6 @@ CONFIG_BLK_DEV_NVME=m
CONFIG_QCOM_COINCELL=m
CONFIG_QCOM_FASTRPC=m
CONFIG_BATTERY_QCOM_BATTMGR=m
-CONFIG_QCOM_PMIC_GLINK=m
-CONFIG_TYPEC_UCSI=m
CONFIG_UCSI_PMIC_GLINK=m
CONFIG_SRAM=y
CONFIG_PCI_ENDPOINT_TEST=m