diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 1a3fff23cba9..b28707a99ffe 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -29,6 +29,8 @@ CONFIG_USB_CONFIGFS_F_DIAG=m
 CONFIG_USB_CONFIGFS_F_CCID=m
 CONFIG_USB_CONFIGFS_F_CDEV=m
 CONFIG_USB_CONFIGFS_F_GSI=m
+CONFIG_USB_CONFIGFS_MASS_STORAGE=m
+CONFIG_USB_STORAGE=m
 CONFIG_TYPEC=m
 CONFIG_TYPEC_UCSI=m
 CONFIG_UCSI_QTI_GLINK=m
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index f29cde890e11..72f323bbd9b8 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -375,7 +375,7 @@ config USB_CONFIGFS_PHONET
 	  The Phonet protocol implementation for USB device.
 
 config USB_CONFIGFS_MASS_STORAGE
-	bool "Mass storage"
+	tristate "Mass storage"
 	depends on USB_CONFIGFS
 	depends on BLOCK
 	select USB_F_MASS_STORAGE