Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / net / dccp / ccids / Kconfig

diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index 0581143cb800d9b0b43bd86d0d2dcebf24abd3c1..8ba3fc9d6d168f33deecb17a61b62e84353993ab 100644 (file)
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -1,5 +1,4 @@
-menu "DCCP CCIDs Configuration (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+menu "DCCP CCIDs Configuration"
 
 config IP_DCCP_CCID2_DEBUG
        bool "CCID-2 debugging messages"
@@ -12,7 +11,7 @@ config IP_DCCP_CCID2_DEBUG
          If in doubt, say N.
 
 config IP_DCCP_CCID3
-       bool "CCID-3 (TCP-Friendly) (EXPERIMENTAL)"
+       bool "CCID-3 (TCP-Friendly)"
        def_bool y if (IP_DCCP = y || IP_DCCP = m)
        ---help---
          CCID-3 denotes TCP-Friendly Rate Control (TFRC), an equation-based