move arm ARCH symbols to the generic configs

[openwrt/openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 140-netfilter_time.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch b/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
index ba6b5dc3202fef3e0ee6b4e2786541dbb357b4de..6f623461b3140428db32250e5410bdd121f16ec7 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
@@ -204,36 +204,34 @@
 +}
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
 +}
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig

-@@ -63,6 +63,22 @@
-       help
-         Module for matching traffic of various Peer-to-Peer applications
+@@ -57,6 +57,20 @@ config IP_NF_IPTABLES
+         To compile it as a module, choose M here.  If unsure, say N.

  
  

-+
+ # The matches.

 +config IP_NF_MATCH_TIME
 +      tristate  'TIME match support'
 +config IP_NF_MATCH_TIME
 +      tristate  'TIME match support'

-+      depends on IP_NF_IPTABLES
-+      help
-+        This option adds a `time' match, which allows you
-+        to match based on the packet arrival time/date
-+        (arrival time/date 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 and read
++      depends on IP_NF_IPTABLES
++      help
++        This option adds a `time' match, which allows you
++        to match based on the packet arrival time/date
++        (arrival time/date at the machine which netfilter is running on) or
++        departure time/date (for locally generated packets).

 +
 +

-+        Documentation/modules.txt.  If unsure, say `N'.
++        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 and read

 +
 +

++        Documentation/modules.txt.  If unsure, say `N'.

 +
  config IP_NF_MATCH_RECENT
        tristate '"recent" match support'
        depends on IP_NF_IPTABLES
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
 +
  config IP_NF_MATCH_RECENT
        tristate '"recent" match support'
        depends on IP_NF_IPTABLES
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile

-@@ -47,6 +47,7 @@
+@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn

  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
 +obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o
  
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
 +obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o
  

- obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
- 
+ # targets
+ obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o