aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorIan Campbell <icampbell@arcom.com>2005-06-29 10:15:32 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2005-07-12 11:52:56 -0700
commit05f33400307cfe9d89dbeca659731b9055fefbf8 (patch)
tree6c95b6744509026c142d81d0dce2de0bff626d88 /drivers
parentb9df978f1974fea373741367b5d79a2ed3b7dcf9 (diff)
downloadkernel_samsung_aries-05f33400307cfe9d89dbeca659731b9055fefbf8.zip
kernel_samsung_aries-05f33400307cfe9d89dbeca659731b9055fefbf8.tar.gz
kernel_samsung_aries-05f33400307cfe9d89dbeca659731b9055fefbf8.tar.bz2
[PATCH] USB: gadget/ether fixes
Signed-off-by: Ian Campbell <icampbell@arcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/ether.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 00a5d25..b5647b5 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2428,7 +2428,7 @@ autoconf_fail:
dev->req->complete = eth_setup_complete;
/* ... and maybe likewise for status transfer */
-#ifdef DEV_CONFIG_CDC
+#if defined(DEV_CONFIG_CDC) || defined(CONFIG_USB_ETH_RNDIS)
if (dev->status_ep) {
dev->stat_req = eth_req_alloc (dev->status_ep,
STATUS_BYTECOUNT, GFP_KERNEL);