summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-21 16:59:45 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-21 16:59:45 +0000
commitfa54d3c0a97b74ceb351b09762b66298c23806e1 (patch)
tree47c104bb281332230ccbf564c54bce9fb96c58f0 /target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
parentabddbd4f18174c9f89ac712e1baf477de690eede (diff)
merge netfilter kernel changes to 2.6.26 as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14600 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 505d0d1db..73ce330db 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