From f324415082e4c25f80f571c8fd1ea962f5db4049 Mon Sep 17 00:00:00 2001
From: Ian Campbell <icampbell@arcom.com>
Date: Wed, 29 Jun 2005 10:15:32 +0100
Subject: [PATCH] --- yaml --- r: 4620 b: refs/heads/master c:
 05f33400307cfe9d89dbeca659731b9055fefbf8 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/gadget/ether.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 49f02eb9508e..43ceccb11d4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9df978f1974fea373741367b5d79a2ed3b7dcf9
+refs/heads/master: 05f33400307cfe9d89dbeca659731b9055fefbf8
diff --git a/trunk/drivers/usb/gadget/ether.c b/trunk/drivers/usb/gadget/ether.c
index 00a5d2566265..b5647b503360 100644
--- a/trunk/drivers/usb/gadget/ether.c
+++ b/trunk/drivers/usb/gadget/ether.c
@@ -2428,7 +2428,7 @@ eth_bind (struct usb_gadget *gadget)
 	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);