From c76780fdd4eca86b915bf3a7e5ea472e997847c2 Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Tue, 23 Jul 2019 15:19:58 -0700 Subject: [PATCH] ANDROID: label cuttlefish modules for gki Bug: 138227143 Test: Boot x86 cuttlefish and gki locally and via forrest Change-Id: Iff0ea7f31f53897e16d753491e41c5f087abf77c Signed-off-by: Ram Muthiah --- arch/arm64/configs/gki_defconfig | 3 ++- arch/x86/configs/gki_defconfig | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 0b1b1bfd75e1..b14881b1f017 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -1,3 +1,4 @@ +CONFIG_LOCALVERSION="-mainline" CONFIG_AUDIT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -319,7 +320,7 @@ CONFIG_USB_HIDDEV=y CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_GADGET=y -CONFIG_USB_DUMMY_HCD=y +CONFIG_USB_DUMMY_HCD=m CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_UEVENT=y CONFIG_USB_CONFIGFS_F_FS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index b0cf50bacb6d..b8e669341c41 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -1,3 +1,4 @@ +CONFIG_LOCALVERSION="-mainline" CONFIG_AUDIT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -267,7 +268,7 @@ CONFIG_HID_MULTITOUCH=y CONFIG_USB_HIDDEV=y CONFIG_USB=y CONFIG_USB_GADGET=y -CONFIG_USB_DUMMY_HCD=y +CONFIG_USB_DUMMY_HCD=m CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_UEVENT=y CONFIG_USB_CONFIGFS_F_FS=y