tty/serial: remove CONFIG_EXPERIMENTAL dependencies

As discussed at the kernel summit this year, CONFIG_EXPERIMENTAL means
nothing, so let's get rid of it.

Cc: Kees Cook <keescook@chromium.org>
Cc: Alan Cox <alan@linux.intel.com>
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>

diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index 830cd62d84925e548cd7480b2d6fb3a4e582a08d..b46c4301b6518b9e0d78b29d9b61bdeabf78ce03 100644 (file)
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -214,8 +214,8 @@ config CYCLADES
          If you haven't heard about it, it's safe to say N.
 
 config CYZ_INTR
-       bool "Cyclades-Z interrupt mode operation (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && CYCLADES
+       bool "Cyclades-Z interrupt mode operation"
+       depends on CYCLADES
        help
          The Cyclades-Z family of multiport cards allows 2 (two) driver op
          modes: polling and interrupt. In polling mode, the driver will check
@@ -285,7 +285,7 @@ config SYNCLINK_GT
 
 config NOZOMI
        tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        help
          If you have a HSDPA driver Broadband Wireless Data Card -
          Globe Trotter PCMCIA card, say Y here.
@@ -294,7 +294,7 @@ config NOZOMI
          will be called nozomi.
 
 config ISI
-       tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
+       tristate "Multi-Tech multiport card support"
        depends on SERIAL_NONSTANDARD && PCI
        select FW_LOADER
        help
@@ -316,8 +316,7 @@ config N_HDLC
          here.
 
 config N_GSM
-       tristate "GSM MUX line discipline support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       tristate "GSM MUX line discipline support"
        depends on NET
        help
          This line discipline provides support for the GSM MUX protocol and

diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index 0282a83f51fbfa58d4771d071fb9414f1e934f44..f47b734c6a7abfda97d21f9dc27f4b95c8fb821d 100644 (file)
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -76,7 +76,7 @@ config HVC_XEN_FRONTEND
 
 config HVC_UDBG
        bool "udbg based fake hypervisor console"
-       depends on PPC && EXPERIMENTAL
+       depends on PPC
        select HVC_DRIVER
        default n
        help

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 26907cf25744f1b5295716bf792cc42cdb9fb069..84c6f374f1fe75c3d4cf8bf5c8a289ad618a6df8 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -693,7 +693,7 @@ config SERIAL_SH_SCI_CONSOLE
 
 config SERIAL_SH_SCI_DMA
        bool "DMA support"
-       depends on SERIAL_SH_SCI && SH_DMAE && EXPERIMENTAL
+       depends on SERIAL_SH_SCI && SH_DMAE
 
 config SERIAL_PNX8XXX
        bool "Enable PNX8XXX SoCs' UART Support"
@@ -1303,8 +1303,8 @@ 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 (EXPERIMENTAL)"
-       depends on GPIOLIB && SPI && EXPERIMENTAL
+        tristate "SPI protocol driver for Infineon 6x60 modem"
+       depends on GPIOLIB && SPI
        help
          Support for the IFX6x60 modem devices on Intel MID platforms.