aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-05-09 06:05:15 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-05-09 06:05:15 +0000
commita69e73af4acb7a4ac96d843e7b90dcccdc7a8191 (patch)
tree12428281757455194fc9b5e14ef66f309f059105 /target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch
parent6ed90b02bdd7be9865cf47fe88663850ef859fc9 (diff)
downloadmaster-187ad058-a69e73af4acb7a4ac96d843e7b90dcccdc7a8191.tar.gz
master-187ad058-a69e73af4acb7a4ac96d843e7b90dcccdc7a8191.tar.bz2
master-187ad058-a69e73af4acb7a4ac96d843e7b90dcccdc7a8191.zip
[kernel] generic-2.6/2.6.30: resync patches for 2.6.30-rc5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15736 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch
index e430cd78f1..fc00d159c3 100644
--- a/target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@
+@@ -160,7 +160,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
-@@ -505,7 +504,6 @@
+@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'