aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-02-21 16:59:45 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-02-21 16:59:45 +0000
commit26754768121227b2fb8ee44809192aaa032e7816 (patch)
tree1d6f251dcbf8010485bcf027cde2ab2c70df5110 /target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
parente1799d38351029f2730ba31de6006f49cdfef75c (diff)
downloadupstream-26754768121227b2fb8ee44809192aaa032e7816.tar.gz
upstream-26754768121227b2fb8ee44809192aaa032e7816.tar.bz2
upstream-26754768121227b2fb8ee44809192aaa032e7816.zip
merge netfilter kernel changes to 2.6.26 as well
SVN-Revision: 14600
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
index 505d0d1db5..73ce330db5 100644
--- a/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
@@ -333,7 +333,7 @@
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -304,6 +304,11 @@ config NF_NAT_IRC
+@@ -282,6 +282,11 @@ config NF_NAT_IRC
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
default NF_NAT && NF_CONNTRACK_IRC