diff options
author | David Brownell <david-b@pacbell.net> | 2005-06-13 09:55:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-27 17:44:04 -0400 |
commit | 822e14ac222d1dad3f5393b75603f0455aebbefc (patch) | |
tree | 1e9a088a05c1abfe31b905fb6cc42c8a13818871 /drivers/usb | |
parent | e3bc8b4e00d0ce219165d469409f2770698574f6 (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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 86affef226e5..5bb53ae88969 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c | |||
@@ -2428,6 +2428,7 @@ autoconf_fail: | |||
2428 | dev->req->complete = eth_setup_complete; | 2428 | dev->req->complete = eth_setup_complete; |
2429 | 2429 | ||
2430 | /* ... and maybe likewise for status transfer */ | 2430 | /* ... and maybe likewise for status transfer */ |
2431 | #ifdef DEV_CONFIG_CDC | ||
2431 | if (dev->status_ep) { | 2432 | if (dev->status_ep) { |
2432 | dev->stat_req = eth_req_alloc (dev->status_ep, | 2433 | dev->stat_req = eth_req_alloc (dev->status_ep, |
2433 | STATUS_BYTECOUNT, GFP_KERNEL); | 2434 | STATUS_BYTECOUNT, GFP_KERNEL); |
@@ -2437,6 +2438,7 @@ autoconf_fail: | |||
2437 | } | 2438 | } |
2438 | dev->stat_req->context = NULL; | 2439 | dev->stat_req->context = NULL; |
2439 | } | 2440 | } |
2441 | #endif | ||
2440 | 2442 | ||
2441 | /* finish hookup to lower layer ... */ | 2443 | /* finish hookup to lower layer ... */ |
2442 | dev->gadget = gadget; | 2444 | dev->gadget = gadget; |