diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-18 17:17:56 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-18 17:17:56 +0100 |
| commit | 5de69349ed4c10f43fa6dc6617051d94eee04e6c (patch) | |
| tree | 4bdc184bec69721a8f8175e4c08ccaf7fcf30970 /drivers/tty | |
| parent | 8b77562b4f867e4bc0c6effb7dfe3255fc265ad0 (diff) | |
| download | linux-3.10-5de69349ed4c10f43fa6dc6617051d94eee04e6c.tar.gz linux-3.10-5de69349ed4c10f43fa6dc6617051d94eee04e6c.tar.bz2 linux-3.10-5de69349ed4c10f43fa6dc6617051d94eee04e6c.zip | |
tty/serial: put (EXPERIMENTAL) marking back on N_GSM and SERIAL_IFX6X60
Alan says these are not production ready, and users should be told this,
so put the "(EXPERIMENTAL)" marking back in the Kconfig entry string.
Reported-by: Alan Cox <alan@linux.intel.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig index b46c4301b65..d8e05eeab23 100644 --- a/drivers/tty/Kconfig +++ b/drivers/tty/Kconfig @@ -316,7 +316,7 @@ config N_HDLC here. config N_GSM - tristate "GSM MUX line discipline support" + tristate "GSM MUX line discipline support (EXPERIMENTAL)" depends on NET help This line discipline provides support for the GSM MUX protocol and diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 84c6f374f1f..2a9659dfb74 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -1303,7 +1303,7 @@ config SERIAL_ALTERA_UART_CONSOLE Enable a Altera UART port to be the system console. config SERIAL_IFX6X60 - tristate "SPI protocol driver for Infineon 6x60 modem" + tristate "SPI protocol driver for Infineon 6x60 modem (EXPERIMENTAL)" depends on GPIOLIB && SPI help Support for the IFX6x60 modem devices on Intel MID platforms. |