Index: linux/drivers/usb/gadget/ether.c
===================================================================
--- linux.orig/drivers/usb/gadget/ether.c	2005-02-03 10:00:29.828415976 +0000
+++ linux/drivers/usb/gadget/ether.c	2005-02-03 10:01:56.434249888 +0000
@@ -2415,9 +2415,11 @@
 				"can't run RNDIS on %s\n",
 				gadget->name);
 			return -ENODEV;
+#ifdef DEV_CONFIG_CDC				
 		} else if (cdc) {
 			control_intf.bNumEndpoints = 0;
 			/* FIXME remove endpoint from descriptor list */
+#endif
 		}
 	}
 #endif