remove the netfilter time patch from 2.6.28 as it duplicates functionality that is...

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.28 / 190-netfilter_rtsp.patch

diff --git a/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
index ef9c56964043715c744242d7f99792006f20a878..62d4cf2e957f6f943da7cd7c7ad66d7571854036 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
@@ -333,7 +333,7 @@
  obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
  obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig

-@@ -283,6 +283,11 @@ config NF_NAT_IRC
+@@ -268,6 +268,11 @@ config NF_NAT_IRC

        depends on NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  
        depends on NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC