A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 23:24:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

usb: gadget: Allow f_rndis and f_gsi to coexist as modules

Browse source 
Currently the make targets for CONFIG_USB_F_RNDIS and
CONFIG_USB_F_GSI both include rndis.o. This would work if only
one is enabled, or both are enabled as =Y as rndis.o will get
linked into the vmlinux image once. Otherwise if both are
enabled with at least one as a module, it results in a module
load failure due to duplicate symbols.

A simple fix for this is to let the usb_f_gsi.o module only
include rndis.o if CONFIG_USB_F_RNDIS is disabled.

Change-Id: Id5b96aaa9a728aa26a65b2c66f2341d6e2fb786b
Signed-off-by: Jack Pham <jackp@codeaurora.org>
This commit is contained in:
Jack Pham 2020-05-08 11:58:07 -07:00
commit 54f034f48c
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/usb/gadget/function/Makefile
View file

@ -62,5 +62,8 @@ usb_f_ccid-y := f_ccid.o
obj-$(CONFIG_USB_F_CCID) += usb_f_ccid.o
usb_f_cdev-y := f_cdev.o
obj-$(CONFIG_USB_F_CDEV) += usb_f_cdev.o
usb_f_gsi-y := f_gsi.o rndis.o
usb_f_gsi-y := f_gsi.o
ifeq ($(CONFIG_USB_F_RNDIS),)
usb_f_gsi-y += rndis.o
endif
obj-$(CONFIG_USB_F_GSI) += usb_f_gsi.o