drivers/net/ppp: remove depends on CONFIG_EXPERIMENTAL

The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ppp/Kconfig b/drivers/net/ppp/Kconfig
index 872df3ef07a60899f13060cae59a498dd81c53e7..278dea0c4c983da461b6b748dff760e905f3556a 100644 (file)
--- a/drivers/net/ppp/Kconfig
+++ b/drivers/net/ppp/Kconfig
@@ -82,8 +82,8 @@ config PPP_FILTER
          If unsure, say N.
 
 config PPP_MPPE
-       tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
-       depends on PPP && EXPERIMENTAL
+       tristate "PPP MPPE compression (encryption)"
+       depends on PPP
        select CRYPTO
        select CRYPTO_SHA1
        select CRYPTO_ARC4
@@ -96,8 +96,8 @@ config PPP_MPPE
          configuring PPTP clients and servers to utilize this method.
 
 config PPP_MULTILINK
-       bool "PPP multilink support (EXPERIMENTAL)"
-       depends on PPP && EXPERIMENTAL
+       bool "PPP multilink support"
+       depends on PPP
        ---help---
          PPP multilink is a protocol (defined in RFC 1990) which allows you
          to combine several (logical or physical) lines into one logical PPP
@@ -118,8 +118,8 @@ config PPPOATM
          changes its encapsulation unilaterally.
 
 config PPPOE
-       tristate "PPP over Ethernet (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PPP
+       tristate "PPP over Ethernet"
+       depends on PPP
        ---help---
          Support for PPP over Ethernet.
 
@@ -130,8 +130,8 @@ config PPPOE
          the heading "Kernel mode PPPoE").
 
 config PPTP
-       tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX
+       tristate "PPP over IPv4 (PPTP)"
+       depends on PPP && NET_IPGRE_DEMUX
        ---help---
          Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
 
@@ -141,8 +141,8 @@ config PPTP
          utilize this module.
 
 config PPPOL2TP
-       tristate "PPP over L2TP (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && L2TP && PPP
+       tristate "PPP over L2TP"
+       depends on L2TP && PPP
        ---help---
          Support for PPP-over-L2TP socket family. L2TP is a protocol
          used by ISPs and enterprises to tunnel PPP traffic over UDP