Merge tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[karo-tx-linux.git] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index c5c6fa60910d3fe309cde04c45f13c46054cc2b0..5a0c541daf893a33a428bedb8d68ec1fa72d4234 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -762,6 +762,7 @@ config USB_GADGET_TARGET
 
 config USB_G_SERIAL
        tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
+       depends on TTY
        select USB_U_SERIAL
        select USB_F_ACM
        select USB_LIBCOMPOSITE
@@ -813,6 +814,8 @@ config USB_G_PRINTER
          For more information, see Documentation/usb/gadget_printer.txt
          which includes sample code for accessing the device file.
 
+if TTY
+
 config USB_CDC_COMPOSITE
        tristate "CDC Composite Device (Ethernet and ACM)"
        depends on NET
@@ -900,6 +903,8 @@ config USB_G_MULTI_CDC
 
          If unsure, say "y".
 
+endif # TTY
+
 config USB_G_HID
        tristate "HID Gadget"
        select USB_LIBCOMPOSITE
@@ -916,6 +921,7 @@ config USB_G_HID
 # Standalone / single function gadgets
 config USB_G_DBGP
        tristate "EHCI Debug Device Gadget"
+       depends on TTY
        select USB_LIBCOMPOSITE
        help
          This gadget emulates an EHCI Debug device. This is useful when you want