From a6f2f23d263ae6669df2b65f98baf56d13bce4ba Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 20 Nov 2012 13:23:15 +0100
Subject: [PATCH] --- yaml --- r: 348671 b: refs/heads/master c:
 1d16638e3b9cc195bac18a8fcbca748f33c1bc24 h: refs/heads/master i:   348669:
 57a9ae9454d3456c3bb857f2ae4bfe516616eb8d   348667:
 3b7e0f0825018df4dff0349a9710977d9e24ece7   348663:
 ea69664f624015fe3134c7c58333f54d4be4e6fb   348655:
 ed14e33da4d3b9ae3de0f0e005d2ffbbc7c596cf   348639:
 c54a33e92ee97127d56a1d0c55583474472d3e05   348607:
 85c51f5d5f3d03c015b411661091fa11a5cd220a   348543:
 ded18fc50461c4b2d3afb6efb3a028e8700fa75a   348415:
 2ea98c04aa9cacddb3f0d3f3feda9ae6df47e480   348159:
 2fe83f96eeb18257230da3d40c2bf8ef29ceb30d v: v3

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

diff --git a/[refs] b/[refs]
index a27fae4a794b..8d330507016b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3f1dbd21ddfaa22649b93212d5ac4b052c1e4a7
+refs/heads/master: 1d16638e3b9cc195bac18a8fcbca748f33c1bc24
diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c
index 95d584dbed13..8cf0c0f6fa1f 100644
--- a/trunk/drivers/usb/gadget/dummy_hcd.c
+++ b/trunk/drivers/usb/gadget/dummy_hcd.c
@@ -130,10 +130,7 @@ static const char ep0name[] = "ep0";
 static const char *const ep_name[] = {
 	ep0name,				/* everyone has ep0 */
 
-	/* act like a net2280: high speed, six configurable endpoints */
-	"ep-a", "ep-b", "ep-c", "ep-d", "ep-e", "ep-f",
-
-	/* or like pxa250: fifteen fixed function endpoints */
+	/* act like a pxa250: fifteen fixed function endpoints */
 	"ep1in-bulk", "ep2out-bulk", "ep3in-iso", "ep4out-iso", "ep5in-int",
 	"ep6in-bulk", "ep7out-bulk", "ep8in-iso", "ep9out-iso", "ep10in-int",
 	"ep11in-bulk", "ep12out-bulk", "ep13in-iso", "ep14out-iso",
@@ -141,6 +138,10 @@ static const char *const ep_name[] = {
 
 	/* or like sa1100: two fixed function endpoints */
 	"ep1out-bulk", "ep2in-bulk",
+
+	/* and now some generic EPs so we have enough in multi config */
+	"ep3out", "ep4in", "ep5out", "ep6out", "ep7in", "ep8out", "ep9in",
+	"ep10out", "ep11out", "ep12in", "ep13out", "ep14in", "ep15out",
 };
 #define DUMMY_ENDPOINTS	ARRAY_SIZE(ep_name)