summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/Kconfig
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2013-10-09 10:08:26 +0200
committerFelipe Balbi <balbi@ti.com>2013-10-10 10:24:43 -0500
commit4d1a8f68b42d2a726e36bfe2f891496b4c6bdbbb (patch)
treedd220555877c4330721aed74ca73c66da9298aae /drivers/usb/gadget/Kconfig
parent7388901528411cbda3f5e0d121ae3797f4397ded (diff)
downloadlinux-stable-4d1a8f68b42d2a726e36bfe2f891496b4c6bdbbb.tar.gz
linux-stable-4d1a8f68b42d2a726e36bfe2f891496b4c6bdbbb.tar.bz2
linux-stable-4d1a8f68b42d2a726e36bfe2f891496b4c6bdbbb.zip
usb: gadget: multi: convert to new interface of f_rndis
Convert the legacy multi gadget to the new interface of f_rndis, so that later the compatibility layer in f_rndis can be removed. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
-rw-r--r--drivers/usb/gadget/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 92a896653cd6..bbcc313f0317 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -1036,7 +1036,6 @@ config USB_G_MULTI
select USB_LIBCOMPOSITE
select USB_U_SERIAL
select USB_U_ETHER
- select USB_U_RNDIS
select USB_F_ACM
select USB_U_MS
help
@@ -1057,6 +1056,8 @@ config USB_G_MULTI
config USB_G_MULTI_RNDIS
bool "RNDIS + CDC Serial + Storage configuration"
depends on USB_G_MULTI
+ select USB_U_RNDIS
+ select USB_F_RNDIS
default y
help
This option enables a configuration with RNDIS, CDC Serial and