diff options
| author |   Olof Johansson <olof@lixom.net> | 2019-12-05 13:16:58 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-12-05 13:18:54 -0800 |
| commit | 942e6f8a8314e5550e254519dfba4ccd5170421d (patch) | |
| tree | 75ec655b440fbc1c454247af38b5596dd8c78de9 /drivers/staging/fwserial/Kconfig | |
| parent | ARM: pxa: Fix resource properties (diff) | |
| parent | Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc (diff) | |
| download | linux-dev-942e6f8a8314e5550e254519dfba4ccd5170421d.tar.xz linux-dev-942e6f8a8314e5550e254519dfba4ccd5170421d.zip | |
Merge mainline/master into arm/fixes
This brings in the mainline tree right after armsoc contents was merged
this release cycle, so that we can re-run savedefconfig, etc.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/staging/fwserial/Kconfig')
| -rw-r--r-- | drivers/staging/fwserial/Kconfig | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/fwserial/Kconfig b/drivers/staging/fwserial/Kconfig index 9543f8454af9..6964aac2a7ed 100644 --- a/drivers/staging/fwserial/Kconfig +++ b/drivers/staging/fwserial/Kconfig @@ -1,9 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 config FIREWIRE_SERIAL - tristate "TTY over Firewire" - depends on FIREWIRE && TTY - help - This enables TTY over IEEE 1394, providing high-speed serial + tristate "TTY over Firewire" + depends on FIREWIRE && TTY + help + This enables TTY over IEEE 1394, providing high-speed serial connectivity to cabled peers. This driver implements a ad-hoc transport protocol and is currently limited to Linux-to-Linux communication. @@ -14,18 +14,18 @@ config FIREWIRE_SERIAL if FIREWIRE_SERIAL config FWTTY_MAX_TOTAL_PORTS - int "Maximum number of serial ports supported" - default "64" - help - Set this to the maximum number of serial ports you want the + int "Maximum number of serial ports supported" + default "64" + help + Set this to the maximum number of serial ports you want the firewire-serial driver to support. config FWTTY_MAX_CARD_PORTS - int "Maximum number of serial ports supported per adapter" - range 0 FWTTY_MAX_TOTAL_PORTS - default "32" - help - Set this to the maximum number of serial ports each firewire + int "Maximum number of serial ports supported per adapter" + range 0 FWTTY_MAX_TOTAL_PORTS + default "32" + help + Set this to the maximum number of serial ports each firewire adapter supports. The actual number of serial ports registered is set with the module parameter "ttys". |