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
commit11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da (patch)
treecdfe45082cf11d9c3d0d51f1315c08b833b4813f /target/linux/generic/patches-2.6.36/180-netfilter_depends.patch
parent978ecae6855efdd2806c2975b85b22c9b2833862 (diff)
downloadupstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.gz
upstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.bz2
upstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.zip
linux/generic: refresh 2.6.36 kernel patches
SVN-Revision: 23237
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'