[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 <icampbell@arcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index b5647b50336043f689b44c91334bfa789538c836..8509e955007dab54e0fd6e3ec5f5e3b1e606cf2f 100644 (file)
--- 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;