aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-18 12:17:56 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-18 12:17:56 -0400
commit5de69349ed4c10f43fa6dc6617051d94eee04e6c (patch)
tree4bdc184bec69721a8f8175e4c08ccaf7fcf30970 /drivers/tty
parent8b77562b4f867e4bc0c6effb7dfe3255fc265ad0 (diff)
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/Kconfig2
-rw-r--r--drivers/tty/serial/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index b46c4301b651..d8e05eeab232 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -316,7 +316,7 @@ config N_HDLC
316 here. 316 here.
317 317
318config N_GSM 318config N_GSM
319 tristate "GSM MUX line discipline support" 319 tristate "GSM MUX line discipline support (EXPERIMENTAL)"
320 depends on NET 320 depends on NET
321 help 321 help
322 This line discipline provides support for the GSM MUX protocol and 322 This line discipline provides support for the GSM MUX protocol and
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 84c6f374f1fe..2a9659dfb74c 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1303,7 +1303,7 @@ config SERIAL_ALTERA_UART_CONSOLE
1303 Enable a Altera UART port to be the system console. 1303 Enable a Altera UART port to be the system console.
1304 1304
1305config SERIAL_IFX6X60 1305config SERIAL_IFX6X60
1306 tristate "SPI protocol driver for Infineon 6x60 modem" 1306 tristate "SPI protocol driver for Infineon 6x60 modem (EXPERIMENTAL)"
1307 depends on GPIOLIB && SPI 1307 depends on GPIOLIB && SPI
1308 help 1308 help
1309 Support for the IFX6x60 modem devices on Intel MID platforms. 1309 Support for the IFX6x60 modem devices on Intel MID platforms.