Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / usb / serial / Kconfig

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 76f4622417380eff45c205664cfb3179727edbc7..17b7f9ae36ad16eb183b3eb2cf7ec187ccadf7b5 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -4,7 +4,7 @@
 
 menuconfig USB_SERIAL
        tristate "USB Serial Converter support"
-       depends on USB
+       depends on USB && TTY
        ---help---
          Say Y here if you have a USB device that provides normal serial
          ports, or acts like a serial device, and you want to connect it to
@@ -647,6 +647,18 @@ config USB_SERIAL_VIVOPAY_SERIAL
           To compile this driver as a module, choose M here: the
           module will be called vivopay-serial.
 
+config USB_SERIAL_XSENS_MT
+       tristate "Xsens motion tracker serial interface driver"
+       help
+         Say Y here if you want to use Xsens motion trackers.
+
+         This driver supports the new generation of motion trackers
+         by Xsens. Older devices can be accessed using the FTDI_SIO
+         driver.
+
+         To compile this driver as a module, choose M here: the
+         module will be called xsens_mt.
+
 config USB_SERIAL_ZIO
        tristate "ZIO Motherboard USB serial interface driver"
        help