aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2005-06-13 06:55:03 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-27 14:44:04 -0700
commit822e14ac222d1dad3f5393b75603f0455aebbefc (patch)
tree1e9a088a05c1abfe31b905fb6cc42c8a13818871 /drivers/usb
parente3bc8b4e00d0ce219165d469409f2770698574f6 (diff)
[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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/ether.c2
1 files changed, 2 insertions, 0 deletions
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;