From 7121ba12e297ed38f817277adf13ea0adebbd539 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jul 2020 15:04:51 +0200 Subject: [PATCH] ANDROID: GKI: enable usb storage drivers This enables both CONFIG_USB_STORAGE=y and CONFIG_USB_UAS=y so that systems that want to support usb storage devices will work with the GKI base kernel image. Bug: 161091250 Bug: 161190032 Cc: zhang sanshan Cc: JaeHun Jung Signed-off-by: Greg Kroah-Hartman Change-Id: Ibda9ad03aea3f192c057fd3e479742d52d060f7b --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index e292cead4e1e..ed3ba9b0537e 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -372,6 +372,8 @@ CONFIG_USB_HIDDEV=y CONFIG_USB_OTG=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_STORAGE=y +CONFIG_USB_UAS=y CONFIG_USB_GADGET=y CONFIG_USB_DUMMY_HCD=y CONFIG_USB_CONFIGFS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index f0117037527d..d45457d74fd5 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -328,6 +328,8 @@ CONFIG_HID_WIIMOTE=y CONFIG_USB_HIDDEV=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_STORAGE=y +CONFIG_USB_UAS=y CONFIG_USB_GADGET=y CONFIG_USB_DUMMY_HCD=y CONFIG_USB_CONFIGFS=y