From c5e006c8f0d21d8e203fadcd5f58b50838e11aa3 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 27 Jan 2012 16:25:57 +0000
Subject: [PATCH] First round of changes from debug of USB composite device
 (still has problems)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4342 42af7a65-404d-4744-a932-0658087f49c3
---
 Documentation/NuttxPortingGuide.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index d69a85a11b..9c1dd07c9f 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -5054,10 +5054,17 @@ build
     (only if CONFIG_USBDEV_COMPOSITE is also defined)
   </li>
   <li>
-    <code>CONFIG_COMPOSITE_COMPOSITE</code>:
+    <code>CONFIG_UBMSC_COMPOSITE</code>:
     Configure the mass storage driver as part of a composite driver
     (only if CONFIG_USBDEV_COMPOSITE is also defined)
   </li>
+  <li>
+    <code>CONFIG_COMPOSITE_IAD</code>:
+    If one of the members of the composite has multiple interfaces
+    (such as CDC/ACM), then an Interface Association Descriptor (IAD)
+    will be necessary.  Default:  IAD will be used automatically if
+    needed.  It should not be necessary to set this.
+  </li>
   <li>
     <code>CONFIG_COMPOSITE_EP0MAXPACKET</code>:
     Max packet size for endpoint 0