From icampbell@arcom.com Wed Jun 29 08:05:27 2005
Subject: USB: gadget/ether build fixes.
From: Ian Campbell <icampbell@arcom.com>
To: Greg KH <greg@kroah.com>
Cc: David Brownell <david-b@pacbell.net>
Date: Wed, 29 Jun 2005 10:20:29 +0100
Message-Id: <1120036830.10852.40.camel@icampbell-debian>
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>
---
drivers/usb/gadget/ether.c | 2 ++
1 files changed, 2 insertions(+)
--- gregkh-2.6.orig/drivers/usb/gadget/ether.c 2005-07-01 14:17:39.000000000 -0700
+++ gregkh-2.6/drivers/usb/gadget/ether.c 2005-07-01 14:17:43.000000000 -0700
@@ -954,6 +954,7 @@
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 @@
goto done;
}
}
+#endif
dev->in = ep_desc (dev->gadget, &hs_source_desc, &fs_source_desc);
dev->in_ep->driver_data = dev;