summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/Kconfig
diff options
context:
space:
mode:
authorMichal Nazarewicz2010-06-21 13:57:03 +0200
committerGreg Kroah-Hartman2010-08-10 23:35:36 +0200
commit279cc49a697d5b4f9477cd68eeb4ef20798400fe (patch)
treebc5caceaac31cf536cfb23d7ce730d72b55b96fb /drivers/usb/gadget/Kconfig
parentUSB: gadget: f_mass_storage: dead code removed (diff)
downloadkernel-qcow2-linux-279cc49a697d5b4f9477cd68eeb4ef20798400fe.tar.gz
kernel-qcow2-linux-279cc49a697d5b4f9477cd68eeb4ef20798400fe.tar.xz
kernel-qcow2-linux-279cc49a697d5b4f9477cd68eeb4ef20798400fe.zip
USB: gadget: g_multi: code clean up and refactoring
The Multifunction Composite Gadget have been cleaned up and refactored so hopefully it looks prettier and works at least as good as before changes. A Kconfig has also been fixed to make it impossible to build FunctionFS gadget with no configurations. With this patch, if RNDIS is not chosen by the user CDC is force-selected. Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
-rw-r--r--drivers/usb/gadget/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 591ae9fde199..027f61b1f3d8 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/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