Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30381976 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: Add snapshot of USB GSI function driver" into msm-4.8

parents 03f270d2 0663c43b

drivers/usb/gadget/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -230,6 +230,9 @@ config USB_F_CDEV 
config USB_F_CCID

	tristate



config USB_F_GSI

	tristate



# this first set of drivers all depend on bulk-capable hardware.



config USB_CONFIGFS
@@ -539,6 +542,13 @@ config USB_CONFIGFS_F_CCID 
	  USB CCID function driver creates transport layer between the

	  userspace CCID component and the Windows Host.



config USB_CONFIGFS_F_GSI

	bool "USB GSI function"

	select USB_F_GSI

	depends on USB_CONFIGFS

	help

	  Generic function driver to support h/w acceleration to IPA over GSI.



choice

	tristate "USB Gadget Drivers"

	default USB_ETH

drivers/usb/gadget/function/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -60,3 +60,5 @@ usb_f_cdev-y := f_cdev.o 
obj-$(CONFIG_USB_F_CDEV)	+= usb_f_cdev.o

usb_f_ccid-y			:= f_ccid.o

obj-$(CONFIG_USB_F_CCID)   	+= usb_f_ccid.o

usb_f_gsi-y			:= f_gsi.o rndis.o

obj-$(CONFIG_USB_F_GSI)         += usb_f_gsi.o