Преглед изворни кода

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>
Greg Kroah-Hartman пре 13 година
родитељ
комит
8b77562b4f
3 измењених фајлова са 9 додато и 10 уклоњено
  1. 5 6
      drivers/tty/Kconfig
  2. 1 1
      drivers/tty/hvc/Kconfig
  3. 3 3
      drivers/tty/serial/Kconfig

+ 5 - 6
drivers/tty/Kconfig

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

+ 1 - 1
drivers/tty/hvc/Kconfig

@@ -76,7 +76,7 @@ config HVC_XEN_FRONTEND
 
 
 config HVC_UDBG
 config HVC_UDBG
        bool "udbg based fake hypervisor console"
        bool "udbg based fake hypervisor console"
-       depends on PPC && EXPERIMENTAL
+       depends on PPC
        select HVC_DRIVER
        select HVC_DRIVER
        default n
        default n
        help
        help

+ 3 - 3
drivers/tty/serial/Kconfig

@@ -693,7 +693,7 @@ config SERIAL_SH_SCI_CONSOLE
 
 
 config SERIAL_SH_SCI_DMA
 config SERIAL_SH_SCI_DMA
 	bool "DMA support"
 	bool "DMA support"
-	depends on SERIAL_SH_SCI && SH_DMAE && EXPERIMENTAL
+	depends on SERIAL_SH_SCI && SH_DMAE
 
 
 config SERIAL_PNX8XXX
 config SERIAL_PNX8XXX
 	bool "Enable PNX8XXX SoCs' UART Support"
 	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.
 	  Enable a Altera UART port to be the system console.
 
 
 config SERIAL_IFX6X60
 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
 	help
 	  Support for the IFX6x60 modem devices on Intel MID platforms.
 	  Support for the IFX6x60 modem devices on Intel MID platforms.