Skip to content

Commit

Permalink
[PATCH] USB: gadget/ether build fixes.
Browse files Browse the repository at this point in the history
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 <icampbell@arcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Ian Campbell authored and Greg Kroah-Hartman committed Jul 12, 2005
1 parent 05f3340 commit e828264
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/usb/gadget/ether.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand Down

0 comments on commit e828264

Please sign in to comment.