[kernel] refresh generic patches

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.25 / 180-netfilter_depends.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
index 460db1159f763ab15dc733d2766f657a8cd1e2ef..efab40c2d46bb6687cd9e0c29d40131be95e603a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.1/net/netfilter/Kconfig
-===================================================================
---- linux-2.6.25.1.orig/net/netfilter/Kconfig
-+++ linux-2.6.25.1/net/netfilter/Kconfig
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
 @@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP
  
  config NF_CONNTRACK_H323
@@ -11,7 +9,7 @@ Index: linux-2.6.25.1/net/netfilter/Kconfig
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -456,7 +456,7 @@ config NETFILTER_XT_TARGET_TARPIT
+@@ -423,7 +423,7 @@ config NETFILTER_XT_TARGET_CONNSECMARK
  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'