From: David Brownell <david-b@pacbell.net>
Date: Mon, 13 Jun 2005 13:55:03 +0000 (-0700)
Subject: [PATCH] USB: resolve ethernet gadget build glitch on pxa
X-Git-Tag: v2.6.13-rc1~51^2~8^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=822e14ac222d1dad3f5393b75603f0455aebbefc;p=linux-2.6-omap-h63xx.git

[PATCH] USB: resolve ethernet gadget build glitch on pxa

This fixes a build error on pxa25x processes with pxa2xx_udc and

        CONFIG_USB_ETH=m
        # CONFIG_USB_ETH_RNDIS is not set

The error is because on that CPU there's no status transfer support
except with RNDIS.  Workaround, enable the RNDIS support too.

Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 86affef226e..5bb53ae8896 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2428,6 +2428,7 @@ autoconf_fail:
 	dev->req->complete = eth_setup_complete;
 
 	/* ... and maybe likewise for status transfer */
+#ifdef DEV_CONFIG_CDC
 	if (dev->status_ep) {
 		dev->stat_req = eth_req_alloc (dev->status_ep,
 					STATUS_BYTECOUNT, GFP_KERNEL);
@@ -2437,6 +2438,7 @@ autoconf_fail:
 		}
 		dev->stat_req->context = NULL;
 	}
+#endif
 
 	/* finish hookup to lower layer ... */
 	dev->gadget = gadget;