aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
commit0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2 (patch)
tree5e3bc42552316a5cdaf8eee331305ff7b55c7bad /target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
parent2004a63a81f73ab8d3b926815a11119b5b81c071 (diff)
downloadupstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.tar.gz
upstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.tar.bz2
upstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.zip
refresh generic 2.6.25 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
index 9a49199f0c..dbdcf39e7b 100644
--- a/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/net/netfilter/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/net/netfilter/Kconfig
-+++ linux-2.6.25.4/net/netfilter/Kconfig
-@@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -145,7 +145,7 @@
config NF_CONNTRACK_H323
tristate "H.323 protocol support"
@@ -11,7 +9,7 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -456,7 +456,7 @@ config NETFILTER_XT_TARGET_TARPIT
+@@ -456,7 +456,7 @@
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'