aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
commit76f0b54cd5e718183374acb8bd4e0e00eb91ca17 (patch)
tree0c8716c5e67d2f8142dc9e18a5bac307c709c041 /target/linux/generic/patches-2.6.36/180-netfilter_depends.patch
parent3784ca2da7f11cd7f8301e52a475459331a8fc5a (diff)
downloadupstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.tar.gz
upstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.tar.bz2
upstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.zip
linux/generic: refresh 2.6.36 kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23237 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/180-netfilter_depends.patch')
-rw-r--r--target/linux/generic/patches-2.6.36/180-netfilter_depends.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch b/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch
index 5532e2b350..65c4d44c2b 100644
--- a/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch
+++ b/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -173,7 +173,6 @@ config NF_CONNTRACK_FTP
+@@ -152,7 +152,6 @@ config NF_CONNTRACK_FTP
config NF_CONNTRACK_H323
tristate "H.323 protocol support"
@@ -8,7 +8,7 @@
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -550,7 +549,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -557,7 +556,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'