Commit f82716d6 authored Jun 30, 2020 by John Stultz Committed by YongQin Liu Sep 16, 2020

ANDROID: hikey960_gki.fragment: Remove UFS and USB bits



Remove CONFIG_SCSI_UFS_HISI=m and CONFIG_TYPEC_TCPM=m
from the hikey960_gki.fragment, as those configs have
been added to the gki_defconfig

Fixes: bb765ef8427e ("ANDROID: GKI: enable QCOM and HISI UFS drivers")
Fixes: 5625a6460e96 ("ANDROID: GKI: enable CONFIG_TYPEC_TCPM")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I124a0d050c7170557d9672968729af196ad2f81c
(cherry picked from commit ae78c73104aa2fa957cbb7b4524c3e3e862174fd)

parent 5d5378d6

arch/arm64/configs/hikey960_gki.fragment

+0 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ CONFIG_CONNECTOR=m
		CONFIG_BLK_DEV_NVME=m
		CONFIG_NVME_TARGET=m
		CONFIG_HISI_HIKEY_USB=m
		CONFIG_SCSI_UFS_HISI=m
		CONFIG_WLAN_VENDOR_TI=y
		CONFIG_WL18XX=m
		CONFIG_WLCORE_SDIO=m
		@@ -37,7 +36,6 @@ CONFIG_USB_OHCI_HCD=m
		CONFIG_USB_OHCI_HCD_PLATFORM=m
		CONFIG_USB_DWC3=m
		CONFIG_USB_GADGETFS=m
		CONFIG_TYPEC_TCPM=m
		CONFIG_TYPEC_TCPCI=m
		CONFIG_TYPEC_RT1711H=m
		CONFIG_MMC_BLOCK=m