[PATCH] USB: PXA 2xx UDC and RNDIS g_ether

I noticed some problems with the PXA 2xx UDC and the
RNDIS version of the ethernet-over-usb link:

  - Static linking needs more than just two endpoints now

  - The endpoint autoconfig misbehaves (sounds like what
    Stefan reported a couple weeks ago)

This patch fixes those two problems, though there are
a couple others lurking too.

drivers/usb/gadget/Kconfig

@@ -95,6 +95,7 @@ config USB_PXA2XX
 config USB_PXA2XX_SMALL
 	depends on USB_GADGET_PXA2XX
 	bool
+	default n if USB_ETH_RNDIS
 	default y if USB_ZERO
 	default y if USB_ETH
 	default y if USB_G_SERIAL

drivers/usb/gadget/epautoconf.c

@@ -96,7 +96,8 @@ ep_matches (
 				/* for now, avoid PXA "interrupt-in";
 				 * it's documented as never using DATA1.
 				 */
-				if (gadget_is_pxa (gadget))
+				if (gadget_is_pxa (gadget)
+						&& 'i' == tmp [1])
 					return 0;
 				break;
 			case USB_ENDPOINT_XFER_BULK: