The u_rndis.ko module is used only by f_rndis_usb.ko module, so the two can be merged. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> --- drivers/usb/gadget/Kconfig | 6 ------ drivers/usb/gadget/Makefile | 4 +--- 2 files changed, 1 insertions(+), 9 deletions(-) diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 21114e2..fd3d451 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -514,9 +514,6 @@ config USB_U_SERIAL config USB_U_ETHER tristate -config USB_U_RNDIS - tristate - config USB_F_MASS_STORAGE tristate @@ -626,7 +623,6 @@ config USB_ETH depends on NET select USB_LIBCOMPOSITE select USB_U_ETHER - select USB_U_RNDIS select USB_F_EEM select USB_F_ECM select USB_F_SUBSET @@ -759,7 +755,6 @@ config USB_FUNCTIONFS_RNDIS bool "Include configuration with RNDIS (Ethernet)" depends on USB_FUNCTIONFS && NET select USB_U_ETHER - select USB_U_RNDIS select USB_F_RNDIS help Include a configuration with RNDIS function (Ethernet) and the Filesystem. @@ -910,7 +905,6 @@ config USB_G_MULTI select USB_LIBCOMPOSITE select USB_U_SERIAL select USB_U_ETHER - select USB_U_RNDIS select USB_F_ACM select USB_F_MASS_STORAGE select USB_F_ECM diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 1d1b010..3e48996 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -84,8 +84,6 @@ f_mass_storage_usb-y := f_mass_storage.o storage_common.o obj-$(CONFIG_USB_F_MASS_STORAGE)+= f_mass_storage_usb.o obj-$(CONFIG_USB_U_SERIAL) += u_serial.o obj-$(CONFIG_USB_U_ETHER) += u_ether.o -u_rndis-y := rndis.o -obj-$(CONFIG_USB_U_RNDIS) += u_rndis.o f_ncm_usb-y := f_ncm.o obj-$(CONFIG_USB_F_NCM) += f_ncm_usb.o f_eem_usb-y := f_eem.o @@ -94,5 +92,5 @@ f_ecm_usb-y := f_ecm.o obj-$(CONFIG_USB_F_ECM) += f_ecm_usb.o f_ecm_subset_usb-y := f_subset.o obj-$(CONFIG_USB_F_ECM) += f_ecm_subset_usb.o -f_rndis_usb-y := f_rndis.o +f_rndis_usb-y := f_rndis.o rndis.o obj-$(CONFIG_USB_F_RNDIS) += f_rndis_usb.o -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
