From 283b3158966cc02b0070047a12434ad6a599bc85 Mon Sep 17 00:00:00 2001
From: Praveena Nadahally <praveen.nadahally@stericsson.com>
Date: Fri, 10 Sep 2010 23:05:03 +0530
Subject: [PATCH] --- yaml --- r: 213563 b: refs/heads/master c:
 5c8db070b4480c43394680d9dfd2ddb06b97d2ae h: refs/heads/master i:   213561:
 b5bd46f7972ba8318227ec8451e1998aea941054   213559:
 b81241acfa5c776550944d8fc92e2aad2a5f578b v: v3

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

diff --git a/[refs] b/[refs]
index db4f087f29b3..39c078c2848b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92d3489ec58b5897a407b07ad9954497a119d3d0
+refs/heads/master: 5c8db070b4480c43394680d9dfd2ddb06b97d2ae
diff --git a/trunk/drivers/usb/gadget/f_acm.c b/trunk/drivers/usb/gadget/f_acm.c
index d47a123f15ab..bd6226cbae86 100644
--- a/trunk/drivers/usb/gadget/f_acm.c
+++ b/trunk/drivers/usb/gadget/f_acm.c
@@ -111,7 +111,7 @@ acm_iad_descriptor = {
 	.bInterfaceCount = 	2,	// control + data
 	.bFunctionClass =	USB_CLASS_COMM,
 	.bFunctionSubClass =	USB_CDC_SUBCLASS_ACM,
-	.bFunctionProtocol =	USB_CDC_PROTO_NONE,
+	.bFunctionProtocol =	USB_CDC_ACM_PROTO_AT_V25TER,
 	/* .iFunction =		DYNAMIC */
 };