Skip to content

Commit 7b4c00e

Browse files
superna9999andersson
authored andcommitted
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: 4ffd0b0 ("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
1 parent 4ffd0b0 commit 7b4c00e

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/arm64/configs/defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,6 @@ CONFIG_BLK_DEV_NVME=m
274274
CONFIG_QCOM_COINCELL=m
275275
CONFIG_QCOM_FASTRPC=m
276276
CONFIG_BATTERY_QCOM_BATTMGR=m
277-
CONFIG_QCOM_PMIC_GLINK=m
278-
CONFIG_TYPEC_UCSI=m
279277
CONFIG_UCSI_PMIC_GLINK=m
280278
CONFIG_SRAM=y
281279
CONFIG_PCI_ENDPOINT_TEST=m

0 commit comments

Comments
 (0)