aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-08 06:47:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-08 06:47:31 -0400
commit463311960e9312245418af98dce8c0161fd6b827 (patch)
tree9529b6063b10f1b85408ef4757d1917dfdb8292d /drivers/usb/serial/Kconfig
parent87d7bcee4f5973a593b0d50134364cfe5652ff33 (diff)
parent4ed9a3d455558406cad83d38764ee659de25851c (diff)
Merge tag 'usb-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB updates from Greg KH: "Here's the big USB patchset for 3.18-rc1. Also in here is the PHY tree, as it seems to fit well with the USB tree for various reasons... Anyway, lots of little changes in here, all over the place, full details in the changelog All have been in the linux-next tree for a while with no issues" * tag 'usb-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (244 commits) USB: host: st: fix typo 'CONFIG_USB_EHCI_HCD_ST' uas: Reduce number of function arguments for uas_alloc_foo functions xhci: Allow xHCI drivers to be built as separate modules xhci: Export symbols used by host-controller drivers xhci: Check for XHCI_COMP_MODE_QUIRK when disabling D3cold xhci: Introduce xhci_init_driver() usb: hcd: add generic PHY support usb: rename phy to usb_phy in HCD usb: gadget: uvc: fix up uvcg_v4l2_get_unmapped_area typo USB: host: st: fix ehci/ohci driver selection usb: host: ehci-exynos: Remove unnecessary usb-phy support usb: core: return -ENOTSUPP for all targeted hosts USB: Remove .owner field for driver usb: core: log higher level message on malformed LANGID descriptor usb: Add LED triggers for USB activity usb: Rename usb-common.c usb: gadget: Refactor request completion usb: gadget: Introduce usb_gadget_giveback_request() usb: dwc2/gadget: move phy bus legth initialization phy: remove .owner field for drivers using module_platform_driver ...
Diffstat (limited to 'drivers/usb/serial/Kconfig')
-rw-r--r--drivers/usb/serial/Kconfig10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 3ce5c74b29e4..a69f7cd9d0bf 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -58,9 +58,11 @@ config USB_SERIAL_SIMPLE
58 handles a wide range of very simple devices, all in one 58 handles a wide range of very simple devices, all in one
59 driver. Specifically, it supports: 59 driver. Specifically, it supports:
60 - Suunto ANT+ USB device. 60 - Suunto ANT+ USB device.
61 - Medtronic CareLink USB device
61 - Fundamental Software dongle. 62 - Fundamental Software dongle.
62 - HP4x calculators 63 - HP4x calculators
63 - a number of Motorola phones 64 - a number of Motorola phones
65 - Novatel Wireless GPS receivers
64 - Siemens USB/MPI adapter. 66 - Siemens USB/MPI adapter.
65 - ViVOtech ViVOpay USB device. 67 - ViVOtech ViVOpay USB device.
66 - Infineon Modem Flashloader USB interface 68 - Infineon Modem Flashloader USB interface
@@ -682,14 +684,6 @@ config USB_SERIAL_WISHBONE
682 To compile this driver as a module, choose M here: the 684 To compile this driver as a module, choose M here: the
683 module will be called wishbone-serial. 685 module will be called wishbone-serial.
684 686
685config USB_SERIAL_ZTE
686 tristate "ZTE USB serial driver"
687 help
688 Say Y here if you want to use a ZTE USB to serial device.
689
690 To compile this driver as a module, choose M here: the
691 module will be called zte.
692
693config USB_SERIAL_SSU100 687config USB_SERIAL_SSU100
694 tristate "USB Quatech SSU-100 Single Port Serial Driver" 688 tristate "USB Quatech SSU-100 Single Port Serial Driver"
695 help 689 help