From: Ian Campbell Date: Wed, 29 Jun 2005 09:20:29 +0000 (+0100) Subject: [PATCH] USB: gadget/ether build fixes. X-Git-Tag: v2.6.13-rc3~69 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e828264ee797d40b1df99fe88c6acfc0f36df639;p=linux-2.6-omap-h63xx.git [PATCH] USB: gadget/ether build fixes. I also needed the following on 2.6.13-rc1 without CONFIG_USB_ETH_RNDIS, symbol fs_status_desc isn't available in that case on PXA255. This builds both with and without ETH_RNDIS, but I haven't actually tested either. Signed-off-by: Ian Campbell Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index b5647b50336..8509e955007 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -954,6 +954,7 @@ set_ether_config (struct eth_dev *dev, unsigned gfp_flags) int result = 0; struct usb_gadget *gadget = dev->gadget; +#if defined(DEV_CONFIG_CDC) || defined(CONFIG_USB_ETH_RNDIS) /* status endpoint used for RNDIS and (optionally) CDC */ if (!subset_active(dev) && dev->status_ep) { dev->status = ep_desc (gadget, &hs_status_desc, @@ -967,6 +968,7 @@ set_ether_config (struct eth_dev *dev, unsigned gfp_flags) goto done; } } +#endif dev->in = ep_desc (dev->gadget, &hs_source_desc, &fs_source_desc); dev->in_ep->driver_data = dev;