From 00e37d5fcab45810d82ffad267b4468b98214705 Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Mon, 14 Dec 2020 13:33:55 -0800 Subject: [PATCH] Revert "ANDROID: GKI: enable CONFIG_USB_DWC3 to be build in" This reverts commit 42d1d3ffd7ca ("ANDROID: GKI: enable CONFIG_USB_DWC3 to be build in") until vendor code which contributes to these drivers is removed. Bug: 175625342 Bug: 175742587 Change-Id: Id4d0edcbefced412dc2718c4936b5ba0cf0b2211 Signed-off-by: Elliot Berman --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 240f80b19c91..e37773e9eb68 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -415,12 +415,12 @@ CONFIG_USB_HIDDEV=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_ACM=y CONFIG_USB_STORAGE=y CONFIG_USB_UAS=y -CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_UEVENT=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 2c853325b0a1..036c36120c5c 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -369,12 +369,12 @@ CONFIG_HID_WIIMOTE=y CONFIG_USB_HIDDEV=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_ACM=y CONFIG_USB_STORAGE=y CONFIG_USB_UAS=y -CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_UEVENT=y