]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
tty/serial: put (EXPERIMENTAL) marking back on N_GSM and SERIAL_IFX6X60
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Sep 2012 16:17:56 +0000 (17:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Sep 2012 16:17:56 +0000 (17:17 +0100)
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>
drivers/tty/Kconfig
drivers/tty/serial/Kconfig

index b46c4301b6518b9e0d78b29d9b61bdeabf78ce03..d8e05eeab23213e503381422735f59fe7240281c 100644 (file)
@@ -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
index 84c6f374f1fe75c3d4cf8bf5c8a289ad618a6df8..2a9659dfb74cbd7549245b7c81e491987084c405 100644 (file)
@@ -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.