summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorDavide Garberi <dade.garberi@gmail.com>2018-10-29 20:24:00 +0100
committerDavide Garberi <dade.garberi@gmail.com>2022-07-27 19:23:19 +0200
commit3be0f0d4715d55ee7283246d9d0cb654a21fa7dc (patch)
tree8856e5bfefb8cae21c8c2f153af54f55db5855e8 /drivers/usb
parentca0580ad6a34fdfe1d69f2329effce3919e8aa6e (diff)
drivers: usb: Fix rndis file inclusion
* We can just remove it from CONFIG_USB_F_GSI and keep it in CONFIG_USB_F_QCRNDIS as I can't get the first to build without the second but I can get the second to build without the first * The same thing is for CONFIG_USB_CONFIGFS_RNDIS * Fixes a build error because of the file being included twice Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/function/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
index e04ca4b97c8e..106507dc7ee0 100644
--- a/drivers/usb/gadget/function/Makefile
+++ b/drivers/usb/gadget/function/Makefile
@@ -26,7 +26,7 @@ usb_f_eem-y := f_eem.o
obj-$(CONFIG_USB_F_EEM) += usb_f_eem.o
usb_f_ecm_subset-y := f_subset.o
obj-$(CONFIG_USB_F_SUBSET) += usb_f_ecm_subset.o
-usb_f_rndis-y := f_rndis.o rndis.o
+usb_f_rndis-y := f_rndis.o
obj-$(CONFIG_USB_F_RNDIS) += usb_f_rndis.o
usb_f_mass_storage-y := f_mass_storage.o storage_common.o
obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o
@@ -57,7 +57,7 @@ usb_f_accessory-y := f_accessory.o
obj-$(CONFIG_USB_F_ACC) += usb_f_accessory.o
usb_f_diag-y := f_diag.o
obj-$(CONFIG_USB_F_DIAG) += usb_f_diag.o
-usb_f_gsi-y := f_gsi.o rndis.o
+usb_f_gsi-y := f_gsi.o
obj-$(CONFIG_USB_F_GSI) += usb_f_gsi.o
usb_f_cdev-y := f_cdev.o
obj-$(CONFIG_USB_F_CDEV) += usb_f_cdev.o