[NETFILTER]: remove NF_CONNTRACK_ENABLED option

[deliverable/linux.git] / net / netfilter / Kconfig

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 4182393186aea1956a7dda133b68a5fc21fb3434..772c58cc2c7e0915677ce59ac5bbf821a4084afb 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -25,8 +25,7 @@ config NETFILTER_NETLINK_LOG
          and is also scheduled to replace the old syslog-based ipt_LOG
          and ip6t_LOG modules.
 
-# Rename this to NF_CONNTRACK in a 2.6.25
-config NF_CONNTRACK_ENABLED
+config NF_CONNTRACK
        tristate "Netfilter connection tracking support"
        help
          Connection tracking keeps a record of what packets have passed
@@ -40,10 +39,6 @@ config NF_CONNTRACK_ENABLED
 
          To compile it as a module, choose M here.  If unsure, say N.
 
-config NF_CONNTRACK
-       tristate
-       default NF_CONNTRACK_ENABLED
-
 config NF_CT_ACCT
        bool "Connection tracking flow accounting"
        depends on NF_CONNTRACK