[POWERPC] fsl_spi: stop using device_type = "spi"

[linux-2.6] / net / netfilter / Kconfig

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 3ac39f1ec775b95e6b3ecea49599090f069aa244..21a9fcc0379671a251a34c9d312c1cfdd874bf08 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -363,7 +363,7 @@ config NETFILTER_XT_TARGET_TRACE
          the tables, chains, rules.
 
          If you want to compile it as a module, say M here and read
-         <file:Documentation/modules.txt>.  If unsure, say `N'.
+         <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NETFILTER_XT_TARGET_SECMARK
        tristate '"SECMARK" target support'
@@ -436,6 +436,7 @@ config NETFILTER_XT_MATCH_CONNBYTES
 config NETFILTER_XT_MATCH_CONNLIMIT
        tristate '"connlimit" match support"'
        depends on NETFILTER_XTABLES
+       depends on NF_CONNTRACK
        ---help---
          This match allows you to match against the number of parallel
          connections to a server per client IP address (or address block).
@@ -664,6 +665,20 @@ config NETFILTER_XT_MATCH_TCPMSS
 
          To compile it as a module, choose M here.  If unsure, say N.
 
+config NETFILTER_XT_MATCH_TIME
+       tristate '"time" match support'
+       depends on NETFILTER_XTABLES
+       ---help---
+         This option adds a "time" match, which allows you to match based on
+         the packet arrival time (at the machine which netfilter is running)
+         on) or departure time/date (for locally generated packets).
+
+         If you say Y here, try `iptables -m time --help` for
+         more information.
+
+         If you want to compile it as a module, say M here.
+         If unsure, say N.
+
 config NETFILTER_XT_MATCH_U32
        tristate '"u32" match support'
        depends on NETFILTER_XTABLES