aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-05-07 03:09:04 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-05-07 03:09:04 +0000
commitf6bf23b9239dd1514bd0aa7bf857a16d1a7f35ed (patch)
tree60b86ca9840078ffc27a9889354c6df446b92485 /target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
parent3a8000d301a2be1b7314fa7daab82bae88e67620 (diff)
downloadupstream-f6bf23b9239dd1514bd0aa7bf857a16d1a7f35ed.tar.gz
upstream-f6bf23b9239dd1514bd0aa7bf857a16d1a7f35ed.tar.bz2
upstream-f6bf23b9239dd1514bd0aa7bf857a16d1a7f35ed.zip
[kernel] update imq patches for 2.6.26, 2.6.27, 2.6.28, 2.6.29 and 2.6.30
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15655 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
index 9144417129..b5a2615d24 100644
--- a/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP
+@@ -160,7 +160,6 @@
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
-@@ -455,7 +454,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -467,7 +466,6 @@
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'