From f759824788128461d6cfb121941293c340d950ad Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Fri, 5 May 2023 00:18:34 +0000 Subject: GKI: U: Remove USB NET kernel config requirements Remove these kernel configs from the android-base.config as these are converted to GKI modules for android14-* and later kernels. CONFIG_USB_NET_AQC111 CONFIG_USB_NET_CDC_NCM Bug: 279972445 Bug: 280896629 Bug: 283116250 Test: TH Change-Id: I99f793358bcc99726305ef88ca335fe023233f30 Signed-off-by: Ramji Jiyani (cherry picked from commit ba21d112051535419045b7caba79a030002bb67e) --- u/android-5.15/android-base.config | 2 -- u/android-6.1/android-base.config | 2 -- 2 files changed, 4 deletions(-) diff --git a/u/android-5.15/android-base.config b/u/android-5.15/android-base.config index d7459d6..bf4c7e5 100644 --- a/u/android-5.15/android-base.config +++ b/u/android-5.15/android-base.config @@ -256,8 +256,6 @@ CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_MIDI=y CONFIG_USB_CONFIGFS_UEVENT=y CONFIG_USB_GADGET=y -CONFIG_USB_NET_AQC111=y -CONFIG_USB_NET_CDC_NCM=y CONFIG_USB_SUPPORT=y CONFIG_UTS_NS=y CONFIG_VETH=y diff --git a/u/android-6.1/android-base.config b/u/android-6.1/android-base.config index 934bee7..f46fd2f 100644 --- a/u/android-6.1/android-base.config +++ b/u/android-6.1/android-base.config @@ -254,8 +254,6 @@ CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_MIDI=y CONFIG_USB_CONFIGFS_UEVENT=y CONFIG_USB_GADGET=y -CONFIG_USB_NET_AQC111=y -CONFIG_USB_NET_CDC_NCM=y CONFIG_USB_SUPPORT=y CONFIG_UTS_NS=y CONFIG_VETH=y -- cgit v1.2.3