import PULS_20160108

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index f41aa0d0c414312163bf2076935fb96adccd7036..c701e39d8d20d6d87e2b70316a52e3779c2c575c 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -607,7 +607,7 @@ config USB_ETH
        help
          This driver implements Ethernet style communication, in one of
          several ways:
-         
+
           - The "Communication Device Class" (CDC) Ethernet Control Model.
             That protocol is often avoided with pure Ethernet adapters, in
             favor of simpler vendor-specific hardware, but is widely
@@ -648,7 +648,7 @@ config USB_ETH_RNDIS
           If you say "y" here, the Ethernet gadget driver will try to provide
           a second device configuration, supporting RNDIS to talk to such
           Microsoft USB hosts.
-          
+
           To make MS-Windows work with this, use Documentation/usb/linux.inf
           as the "driver info file".  For versions of MS-Windows older than
           XP, you'll need to download drivers from Microsoft's website; a URL
@@ -818,6 +818,25 @@ config USB_G_PRINTER
          For more information, see Documentation/usb/gadget_printer.txt
          which includes sample code for accessing the device file.
 
+config USB_G_ANDROID
+       boolean "Android Composite Gadget"
+       select USB_F_ACM
+       select USB_F_SERIAL
+       select USB_LIBCOMPOSITE
+       select USB_U_SERIAL
+       help
+         The Android Composite Gadget supports multiple USB
+         functions: adb, acm, mass storage, mtp, accessory
+         and rndis.
+         Each function can be configured and enabled/disabled
+         dynamically from userspace through a sysfs interface.
+
+config USB_ANDROID_RNDIS_DWORD_ALIGNED
+       boolean "Use double word aligned"
+       depends on USB_G_ANDROID
+       help
+               Provides dword aligned for DMA controller.
+
 if TTY
 
 config USB_CDC_COMPOSITE