summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-18 18:35:47 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-18 18:35:47 +0000
commitaf3243b5d52fcd97a24dfc6e28d8ac4d4c7bfdc3 (patch)
treec752890e176316502ae064e00342c64d54ffc8c8 /target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch
parent0fe492d30bcc484623460c11948831aabc055cbf (diff)
kernel: refresh patches with 2.6.34-rc4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20999 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch
index fc00d159c..1bda13d19 100644
--- a/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP
+@@ -173,7 +173,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 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -530,7 +529,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'