From 552cb0291a49cdd06b54e412390b376fd94b7e35 Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Mon, 14 Dec 2020 13:36:04 -0800 Subject: [PATCH] Revert "ANDROID: GKI: Enable CONFIG_USB_XHCI_HCD" This reverts commit db102bc6beef ("ANDROID: GKI: Enable CONFIG_USB_XHCI_HCD") until vendor code which contrbutes to these drivers is removed. Bug: 175625342 Bug: 175743419 Change-Id: I74f33dd54a8f4c498f0311990faa4f2b3524b37b Signed-off-by: Elliot Berman --- arch/arm64/configs/gki_defconfig | 2 -- arch/x86/configs/gki_defconfig | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index e37773e9eb68..0ee2dfafa67b 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -414,8 +414,6 @@ CONFIG_HID_WIIMOTE=y 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 diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 036c36120c5c..ed6a9bf11143 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -368,8 +368,6 @@ CONFIG_HID_WACOM=y 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