[1/2] usb: gadget: ffs: fix eth module parameters warning in pure-only config

Message ID 1376666868-32581-2-git-send-email-matt.porter@linaro.org
State Superseded
Headers show

Commit Message

Matt Porter Aug. 16, 2013, 3:27 p.m.
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@linaro.org>
---
 drivers/usb/gadget/g_ffs.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch

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,