diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-04-02 22:44:42 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-04-02 22:44:42 +0300 |
| commit | 4f5708b1dc29da3a426c9fa99788155e5c462ece (patch) | |
| tree | 3e797724818c6ccdff2fdfcece1337a5869cb068 | |
| parent | e2cfa5b0fdb9a7f7798628598ed8317ebc390c56 (diff) | |
drivers/usb/gadget/Kconfig: fix a merge errortracking-linaro-android-llct-llct-20150402.0
The linaro-android topic mistakenly added the 2nd "config USB_G_ANDROID"
to drivers/usb/gadget/Kconfig (this option is now in
drivers/usb/gadget/legacy/Kconfig).
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index e70ec6ba10cd..c90ef3893838 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -462,24 +462,6 @@ config USB_CONFIGFS_UEVENT state changes. The gadget can be in any of the following three states: "CONNECTED/DISCONNECTED/CONFIGURED" -config USB_G_ANDROID - boolean "Android Composite Gadget" - select USB_F_ACM - 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. - source "drivers/usb/gadget/legacy/Kconfig" endchoice |