Merge branch 'master' into csb1725

[mv-sheeva.git] / net / ipv4 / netfilter / Kconfig

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 1833bdbf9805474c729483e5abef53ffe99e120d..babd1a2bae5f1b6b35499d5e32a2a6c43c8c7fec 100644 (file)
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -147,7 +147,7 @@ config IP_NF_TARGET_ULOG
          which can only be viewed through syslog.
 
          The appropriate userspace logging daemon (ulogd) may be obtained from
-         <http://www.gnumonks.org/projects/ulogd/>
+         <http://www.netfilter.org/projects/ulogd/index.html>
 
          To compile it as a module, choose M here.  If unsure, say N.
 
@@ -324,10 +324,10 @@ config IP_NF_TARGET_ECN
 
 config IP_NF_TARGET_TTL
        tristate '"TTL" target support'
-       depends on NETFILTER_ADVANCED
+       depends on NETFILTER_ADVANCED && IP_NF_MANGLE
        select NETFILTER_XT_TARGET_HL
        ---help---
-       This is a backwards-compat option for the user's convenience
+       This is a backwards-compatible option for the user's convenience
        (e.g. when running oldconfig). It selects
        CONFIG_NETFILTER_XT_TARGET_HL.