diff --git a/[refs] b/[refs]
index 43ceccb11d4a..8a32b5f2e19e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05f33400307cfe9d89dbeca659731b9055fefbf8
+refs/heads/master: e828264ee797d40b1df99fe88c6acfc0f36df639
diff --git a/trunk/drivers/usb/gadget/ether.c b/trunk/drivers/usb/gadget/ether.c
index b5647b503360..8509e955007d 100644
--- a/trunk/drivers/usb/gadget/ether.c
+++ b/trunk/drivers/usb/gadget/ether.c
@@ -954,6 +954,7 @@ set_ether_config (struct eth_dev *dev, unsigned gfp_flags)
 	int					result = 0;
 	struct usb_gadget			*gadget = dev->gadget;
 
+#if defined(DEV_CONFIG_CDC) || defined(CONFIG_USB_ETH_RNDIS)
 	/* status endpoint used for RNDIS and (optionally) CDC */
 	if (!subset_active(dev) && dev->status_ep) {
 		dev->status = ep_desc (gadget, &hs_status_desc,
@@ -967,6 +968,7 @@ set_ether_config (struct eth_dev *dev, unsigned gfp_flags)
 			goto done;
 		}
 	}
+#endif
 
 	dev->in = ep_desc (dev->gadget, &hs_source_desc, &fs_source_desc);
 	dev->in_ep->driver_data = dev;