diff --git a/[refs] b/[refs] index 7c1299e09511..436f15a5c21b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b77562b4f867e4bc0c6effb7dfe3255fc265ad0 +refs/heads/master: 5de69349ed4c10f43fa6dc6617051d94eee04e6c diff --git a/trunk/drivers/tty/Kconfig b/trunk/drivers/tty/Kconfig index b46c4301b651..d8e05eeab232 100644 --- a/trunk/drivers/tty/Kconfig +++ b/trunk/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/trunk/drivers/tty/serial/Kconfig b/trunk/drivers/tty/serial/Kconfig index 84c6f374f1fe..2a9659dfb74c 100644 --- a/trunk/drivers/tty/serial/Kconfig +++ b/trunk/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.