---

yaml --- r: 207982 b: refs/heads/master c: 279cc49 h: refs/heads/master v: v3
git-mirror · Aug 10, 2010 · f4e4bd2 · f4e4bd2
1 parent f6a0850
commit f4e4bd2
Show file tree

Hide file tree

Showing 3 changed files with 148 additions and 117 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 248720529cb50c6b6cf2ec01748049c6b532a8cc
+refs/heads/master: 279cc49a697d5b4f9477cd68eeb4ef20798400fe
diff --git a/trunk/drivers/usb/gadget/Kconfig b/trunk/drivers/usb/gadget/Kconfig
@@ -863,6 +863,7 @@ config USB_G_NOKIA
 config USB_G_MULTI
 	tristate "Multifunction Composite Gadget (EXPERIMENTAL)"
 	depends on BLOCK && NET
+	select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS
 	help
 	  The Multifunction Composite Gadget provides Ethernet (RNDIS
 	  and/or CDC Ethernet), mass storage and ACM serial link