Fixes the build warning spewed out by USB_ETHERNET_MODULE_PARAMETERS() which was unconditionally included even when ethernet configs are disabled. Signed-off-by: Matt Porter <matt.porter@xxxxxxxxxx> --- drivers/usb/gadget/g_ffs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c index 5327c82..686b776 100644 --- a/drivers/usb/gadget/g_ffs.c +++ b/drivers/usb/gadget/g_ffs.c @@ -45,6 +45,7 @@ static struct eth_dev *the_dev; static int eth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN], struct eth_dev *dev); # endif +USB_ETHERNET_MODULE_PARAMETERS(); #else # define the_dev NULL # define gether_cleanup(dev) do { } while (0) @@ -76,8 +77,6 @@ struct gfs_ffs_obj { USB_GADGET_COMPOSITE_OPTIONS(); -USB_ETHERNET_MODULE_PARAMETERS(); - static struct usb_device_descriptor gfs_dev_desc = { .bLength = sizeof gfs_dev_desc, .bDescriptorType = USB_DT_DEVICE, -- 1.7.9.5 -- 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