From e8dcac39fd63e6be9740acb5342c77f86cae7cdb Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Fri, 29 Jan 2021 12:39:50 -0800 Subject: [PATCH] Revert "Revert "ANDROID: GKI: Enable CONFIG_USB_XHCI_HCD"" This reverts commit 552cb0291a49cdd06b54e412390b376fd94b7e35. As announced, re-enabling CONFIG_USB_XHCI_HCD Bug: 175743419 Signed-off-by: Todd Kjos Change-Id: I0bfa95a621ba97c1811247848cb13be654da020e --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 1327fe18aafd..e8a41dc61dc1 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -417,6 +417,7 @@ 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_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 8266cc5ef1ba..432f3cf37fe1 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -373,6 +373,7 @@ 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_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_ACM=y